Use override instead of virtual where appropriate.

Include/RmlUi/Controls/ElementDataGrid.h

@@ -119,13 +119,13 @@ public:
 	ElementDataGridRow* GetRow(int index) const;
 
 protected:
-	virtual void OnUpdate() override;
+	void OnUpdate() override;
 
-	virtual void OnResize() override;
+	void OnResize() override;
 
 	/// Gets the markup and content of the element.
 	/// @param content[out] The content of the element.
-	virtual void GetInnerRML(Rml::Core::String& content) const;
+	void GetInnerRML(Rml::Core::String& content) const override;
 
 private:
 	typedef std::vector< Column > ColumnList;

Include/RmlUi/Controls/ElementDataGridRow.h

@@ -89,11 +89,11 @@ public:
 	ElementDataGrid* GetParentGrid();
 
 protected:
-	virtual void OnDataSourceDestroy(DataSource* data_source);
-	virtual void OnRowAdd(DataSource* data_source, const Rml::Core::String& table, int first_row_added, int num_rows_added);
-	virtual void OnRowRemove(DataSource* data_source, const Rml::Core::String& table, int first_row_removed, int num_rows_removed);
-	virtual void OnRowChange(DataSource* data_source, const Rml::Core::String& table, int first_row_changed, int num_rows_changed);
-	virtual void OnRowChange(DataSource* data_source, const Rml::Core::String& table);
+	void OnDataSourceDestroy(DataSource* data_source) override;
+	void OnRowAdd(DataSource* data_source, const Rml::Core::String& table, int first_row_added, int num_rows_added) override;
+	void OnRowRemove(DataSource* data_source, const Rml::Core::String& table, int first_row_removed, int num_rows_removed) override;
+	void OnRowChange(DataSource* data_source, const Rml::Core::String& table, int first_row_changed, int num_rows_changed) override;
+	void OnRowChange(DataSource* data_source, const Rml::Core::String& table) override;
 
 private:
 	typedef std::queue< ElementDataGridRow* > RowQueue;

Include/RmlUi/Controls/ElementFormControl.h

@@ -78,7 +78,7 @@ public:
 protected:
 	/// Checks for changes to the 'disabled' attribute.
 	/// @param[in] changed_attributes List of changed attributes on the element.
-	virtual void OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
+	void OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
 };
 
 }

Include/RmlUi/Controls/ElementFormControlDataSelect.h

@@ -60,22 +60,22 @@ public:
 protected:
 	/// If a new data source has been set on the control, this will attach to it and build the
 	/// initial options.
-	virtual void OnUpdate();
+	void OnUpdate() override;
 
 	/// Checks for changes to the data source or formatting attributes.
 	/// @param[in] changed_attributes List of changed attributes on the element.
-	virtual void OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
+	void OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
 
 	/// Detaches from the data source and rebuilds the options.
-	virtual void OnDataSourceDestroy(DataSource* data_source);
+	void OnDataSourceDestroy(DataSource* data_source) override;
 	/// Rebuilds the available options from the data source.
-	virtual void OnRowAdd(DataSource* data_source, const Rml::Core::String& table, int first_row_added, int num_rows_added);
+	void OnRowAdd(DataSource* data_source, const Rml::Core::String& table, int first_row_added, int num_rows_added) override;
 	/// Rebuilds the available options from the data source.
-	virtual void OnRowRemove(DataSource* data_source, const Rml::Core::String& table, int first_row_removed, int num_rows_removed);
+	void OnRowRemove(DataSource* data_source, const Rml::Core::String& table, int first_row_removed, int num_rows_removed) override;
 	/// Rebuilds the available options from the data source.
-	virtual void OnRowChange(DataSource* data_source, const Rml::Core::String& table, int first_row_changed, int num_rows_changed);
+	void OnRowChange(DataSource* data_source, const Rml::Core::String& table, int first_row_changed, int num_rows_changed) override;
 	/// Rebuilds the available options from the data source.
-	virtual void OnRowChange(DataSource* data_source, const Rml::Core::String& table);
+	void OnRowChange(DataSource* data_source, const Rml::Core::String& table) override;
 
 private:
 	// Builds the option list from the data source.

Include/RmlUi/Controls/ElementFormControlInput.h

@@ -54,43 +54,43 @@ public:
 
 	/// Returns a string representation of the current value of the form control.
 	/// @return The value of the form control.
-	virtual Rml::Core::String GetValue() const;
+	Rml::Core::String GetValue() const override;
 	/// Sets the current value of the form control.
 	/// @param value[in] The new value of the form control.
-	virtual void SetValue(const Rml::Core::String& value);
+	void SetValue(const Rml::Core::String& value) override;
 	/// Returns if this value's type should be submitted with the form.
 	/// @return True if the form control is to be submitted, false otherwise.
-	virtual bool IsSubmitted();
+	bool IsSubmitted() override;
 
 protected:
 	/// Updates the element's underlying type.
-	virtual void OnUpdate();
+	void OnUpdate() override;
 	/// Renders the element's underlying type.
-	virtual void OnRender();
+	void OnRender() override;
 	/// Calls the element's underlying type.
-	virtual void OnResize() override;
+	void OnResize() override;
 
 	/// Checks for necessary functional changes in the control as a result of changed attributes.
 	/// @param[in] changed_attributes The list of changed attributes.
-	virtual void OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
+	void OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
 	/// Called when properties on the control are changed.
 	/// @param[in] changed_properties The properties changed on the element.
-	virtual void OnPropertyChange(const Core::PropertyNameList& changed_properties) override;
+	void OnPropertyChange(const Core::PropertyNameList& changed_properties) override;
 
 	/// If we are the added element, this will pass the call onto our type handler.
 	/// @param[in] child The new member of the hierarchy.
-	virtual void OnChildAdd(Rml::Core::Element* child) override;
+	void OnChildAdd(Rml::Core::Element* child) override;
 	/// If we are the removed element, this will pass the call onto our type handler.
 	/// @param[in] child The member of the hierarchy that was just removed.
-	virtual void OnChildRemove(Rml::Core::Element* child) override;
+	void OnChildRemove(Rml::Core::Element* child) override;
 
 	/// Checks for necessary functional changes in the control as a result of the event.
 	/// @param[in] event The event to process.
-	virtual void ProcessDefaultAction(Core::Event& event) override;
+	void ProcessDefaultAction(Core::Event& event) override;
 
 	/// Sizes the dimensions to the element's inherent size.
 	/// @return True.
-	virtual bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
+	bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
 
 private:
 	InputType* type;

Include/RmlUi/Controls/ElementFormControlSelect.h

@@ -55,10 +55,10 @@ public:
 
 	/// Returns a string representation of the current value of the form control.
 	/// @return The value of the form control.
-	virtual Rml::Core::String GetValue() const;
+	Rml::Core::String GetValue() const override;
 	/// Sets the current value of the form control.
 	/// @param[in] value The new value of the form control.
-	virtual void SetValue(const Rml::Core::String& value);
+	void SetValue(const Rml::Core::String& value) override;
 
 	/// Sets the index of the selection. If the new index lies outside of the bounds, it will be clamped.
 	/// @param[in] selection The new selection index.
@@ -91,17 +91,17 @@ public:
 
 protected:
 	/// Moves all children to be under control of the widget.
-	virtual void OnUpdate();
+	void OnUpdate() override;
 	/// Updates the layout of the widget's elements.
-	virtual void OnRender();
+	void OnRender() override;
 
 	/// Forces an internal layout.
-	virtual void OnLayout();
+	void OnLayout() override;
 
 	/// Returns true to mark this element as replaced.
 	/// @param[out] intrinsic_dimensions Set to the arbitrary dimensions of 128 x 16 just to give this element a size. Resize with the 'width' and 'height' properties.
 	/// @return True.
-	virtual bool GetIntrinsicDimensions(Rml::Core::Vector2f& intrinsic_dimensions);
+	bool GetIntrinsicDimensions(Rml::Core::Vector2f& intrinsic_dimensions) override;
 
 	WidgetDropDown* widget;
 };

Include/RmlUi/Controls/ElementFormControlTextArea.h

@@ -55,10 +55,10 @@ public:
 	/// Returns a string representation of the current value of the form control. This is the value of the control
 	/// regardless of whether it has been selected / checked (as appropriate for the control).
 	/// @return The value of the form control.
-	virtual Rml::Core::String GetValue() const override;
+	Rml::Core::String GetValue() const override;
 	/// Sets the current value of the form control.
 	/// @param[in] value The new value of the form control.
-	virtual void SetValue(const Rml::Core::String& value) override;
+	void SetValue(const Rml::Core::String& value) override;
 
 	/// Sets the number of characters visible across the text area. Note that this will only be precise when using
 	/// a fixed-width font.
@@ -92,25 +92,25 @@ public:
 
 	/// Returns the control's inherent size, based on the length of the input field and the current font size.
 	/// @return True.
-	virtual bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
+	bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
 
 protected:
 	/// Updates the control's widget.
-	void OnUpdate();
+	void OnUpdate() override;
 	/// Renders the control's widget.
-	void OnRender();
+	void OnRender() override;
 	/// Formats the element.
-	void OnLayout();
+	void OnLayout() override;
 
 	/// Called when attributes on the element are changed.
-	virtual void OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
+	void OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
 	/// Called when properties on the control are changed.
 	/// @param[in] changed_properties The properties changed on the element.
-	virtual void OnPropertyChange(const Core::PropertyNameList& changed_properties) override;
+	void OnPropertyChange(const Core::PropertyNameList& changed_properties) override;
 
 	/// Returns the text content of the element.
 	/// @param[out] content The content of the element.
-	virtual void GetInnerRML(Rml::Core::String& content) const override;
+	void GetInnerRML(Rml::Core::String& content) const override;
 
 private:
 	WidgetTextInput* widget;		

Include/RmlUi/Controls/ElementTabSet.h

@@ -87,8 +87,8 @@ public:
 
 protected:
 	// Catch child add/removes so we can correctly set up their events.
-	virtual void OnChildAdd(Core::Element* child);
-	virtual void OnChildRemove(Core::Element* child);
+	void OnChildAdd(Core::Element* child) override;
+	void OnChildRemove(Core::Element* child) override;
 
 private:
 	Core::Element* GetChildByTag(const Rml::Core::String& tag);

Include/RmlUi/Core/ElementDocument.h

@@ -125,13 +125,13 @@ public:
 	
 protected:
 	/// Repositions the document if necessary.
-	virtual void OnPropertyChange(const PropertyNameList& changed_properties) override;
+	void OnPropertyChange(const PropertyNameList& changed_properties) override;
 
 	/// Processes the 'onpropertychange' event, checking for a change in position or size.
-	virtual void ProcessDefaultAction(Event& event) override;
+	void ProcessDefaultAction(Event& event) override;
 
 	/// Called during update if the element size has been changed.
-	virtual void OnResize() override;
+	void OnResize() override;
 
 private:
 	/// Find the next element to focus, starting at the current element

Include/RmlUi/Core/EventInstancer.h

@@ -59,10 +59,6 @@ public:
 	/// Releases an event instanced by this instancer.
 	/// @param[in] event The event to release.
 	virtual void ReleaseEvent(Event* event) = 0;
-
-protected:
-	/// Releases this event instancer.
-	virtual void Release() = 0;
 };
 
 }

Samples/basic/customlog/src/SystemInterface.h

@@ -44,13 +44,13 @@ public:
 
 	/// Get the number of seconds elapsed since the start of the application.
 	/// @return Elapsed time, in seconds.
-	virtual double GetElapsedTime();
+	double GetElapsedTime() override;
 
 	/// Log the specified message.
 	/// @param[in] type Type of log message, ERROR, WARNING, etc.
 	/// @param[in] message Message to log.
 	/// @return True to continue execution, false to break into the debugger.
-	virtual bool LogMessage(Rml::Core::Log::Type type, const Rml::Core::String& message);
+	bool LogMessage(Rml::Core::Log::Type type, const Rml::Core::String& message) override;
 
 private:
 	FILE* fp;

Samples/basic/drag/src/DragListener.h

@@ -43,7 +43,7 @@ public:
 	static void RegisterDraggableContainer(Rml::Core::Element* element);
 
 protected:
-	virtual void ProcessEvent(Rml::Core::Event& event);
+	void ProcessEvent(Rml::Core::Event& event) override;
 };
 
 #endif

Samples/basic/treeview/src/FileSystem.h

@@ -45,8 +45,8 @@ public:
 	FileSystem(const Rml::Core::String& root);
 	virtual ~FileSystem();
 
-	virtual void GetRow(Rml::Core::StringList& row, const Rml::Core::String& table, int row_index, const Rml::Core::StringList& columns);
-	virtual int GetNumRows(const Rml::Core::String& table);
+	void GetRow(Rml::Core::StringList& row, const Rml::Core::String& table, int row_index, const Rml::Core::StringList& columns) override;
+	int GetNumRows(const Rml::Core::String& table) override;
 
 private:
 	FileSystemNode* GetNode(const Rml::Core::String& table);

Samples/invaders/src/ElementGame.h

@@ -54,9 +54,9 @@ public:
 
 protected:
 	/// Updates the game.
-	virtual void OnUpdate();
+	void OnUpdate() override;
 	/// Renders the game.
-	virtual void OnRender();
+	void OnRender() override;
 
 private:
 	Game* game;

Samples/invaders/src/EventHandlerHighScore.h

@@ -40,7 +40,7 @@ public:
 	EventHandlerHighScore();
 	virtual ~EventHandlerHighScore();
 
-	virtual void ProcessEvent(Rml::Core::Event& event, const Rml::Core::String& value) override;
+	void ProcessEvent(Rml::Core::Event& event, const Rml::Core::String& value) override;
 };
 
 #endif

Samples/invaders/src/EventHandlerOptions.h

@@ -41,7 +41,7 @@ public:
 	EventHandlerOptions();
 	virtual ~EventHandlerOptions();
 
-	virtual void ProcessEvent(Rml::Core::Event& event, const Rml::Core::String& value) override;
+	void ProcessEvent(Rml::Core::Event& event, const Rml::Core::String& value) override;
 };
 
 #endif

Samples/invaders/src/EventHandlerStartGame.h

@@ -41,7 +41,7 @@ public:
 	EventHandlerStartGame();
 	virtual ~EventHandlerStartGame();
 
-	virtual void ProcessEvent(Rml::Core::Event& event, const Rml::Core::String& value) override;
+	void ProcessEvent(Rml::Core::Event& event, const Rml::Core::String& value) override;
 };
 
 #endif

Samples/invaders/src/Mothership.h

@@ -41,7 +41,7 @@ public:
 	~Mothership();
 
 	/// Update the mothership
-	virtual void Update();	
+	void Update() override;
 
 private:
 	// Time of the last update

Samples/luainvaders/src/ElementGame.h

@@ -54,9 +54,9 @@ public:
 
 protected:
 	/// Updates the game.
-	virtual void OnUpdate() override;
+	void OnUpdate() override;
 	/// Renders the game.
-	virtual void OnRender() override;
+	void OnRender() override;
 
 private:
 	Game* game;

Samples/luainvaders/src/Mothership.h

@@ -41,7 +41,7 @@ public:
 	~Mothership();
 
 	/// Update the mothership
-	virtual void Update();	
+	void Update() override;
 
 private:
 	// Time of the last update

Source/Controls/ElementTextSelection.h

@@ -55,7 +55,7 @@ public:
 
 protected:
 	/// Processes 'color' and 'background-color' property changes.
-	virtual void OnPropertyChange(const Rml::Core::PropertyNameList& changed_properties);
+	void OnPropertyChange(const Rml::Core::PropertyNameList& changed_properties) override;
 
 private:
 	WidgetTextInput* widget;

Source/Controls/InputTypeButton.h

@@ -51,15 +51,15 @@ public:
 
 	/// Returns if this value should be submitted with the form.
 	/// @return True if the form control is to be submitted, false otherwise.
-	virtual bool IsSubmitted();
+	bool IsSubmitted() override;
 
 	/// Checks for necessary functional changes in the control as a result of the event.
 	/// @param[in] event The event to process.
-	virtual void ProcessDefaultAction(Core::Event& event) override;
+	void ProcessDefaultAction(Core::Event& event) override;
 
 	/// Sizes the dimensions to the element's inherent size.
 	/// @return False.
-	virtual bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions);
+	bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
 };
 
 }

Source/Controls/InputTypeCheckbox.h

@@ -48,20 +48,20 @@ public:
 
 	/// Returns if this value should be submitted with the form.
 	/// @return True if the form control is to be submitted, false otherwise.
-	virtual bool IsSubmitted() override;
+	bool IsSubmitted() override;
 
 	/// Checks for necessary functional changes in the control as a result of changed attributes.
 	/// @param[in] changed_attributes The list of changed attributes.
 	/// @return True if no layout is required, false if the layout needs to be dirtied.
-	virtual bool OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
+	bool OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
 
 	/// Checks for necessary functional changes in the control as a result of the event.
 	/// @param[in] event The event to process.
-	virtual void ProcessDefaultAction(Core::Event& event) override;
+	void ProcessDefaultAction(Core::Event& event) override;
 
 	/// Sizes the dimensions to the element's inherent size.
 	/// @return True.
-	virtual bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
+	bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
 };
 
 }

Source/Controls/InputTypeRadio.h

@@ -48,23 +48,23 @@ public:
 
 	/// Returns if this value should be submitted with the form.
 	/// @return True if the form control is to be submitted, false otherwise.
-	virtual bool IsSubmitted() override;
+	bool IsSubmitted() override;
 
 	/// Checks for necessary functional changes in the control as a result of changed attributes.
 	/// @param[in] changed_attributes The list of changed attributes.
 	/// @return True if no layout is required, false if the layout needs to be dirtied.
-	virtual bool OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
+	bool OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
 
 	/// Pops the element's radio set if we are checked.
-	virtual void OnChildAdd() override;
+	void OnChildAdd() override;
 
 	/// Checks for necessary functional changes in the control as a result of the event.
 	/// @param[in] event The event to process.
-	virtual void ProcessDefaultAction(Core::Event& event) override;
+	void ProcessDefaultAction(Core::Event& event) override;
 
 	/// Sizes the dimensions to the element's inherent size.
 	/// @return True.
-	virtual bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
+	bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
 
 private:
 	/// Pops all other radio buttons in our form that share our name.

Source/Controls/InputTypeRange.h

@@ -50,26 +50,26 @@ public:
 
 	/// Returns a string representation of the current value of the form control.
 	/// @return The value of the form control.
-	virtual Rml::Core::String GetValue() const;
+	Rml::Core::String GetValue() const override;
 
 	/// Called every update from the host element.
-	virtual void OnUpdate() override;
+	void OnUpdate() override;
 
 	/// Called every time the host element's size changes.
-	virtual void OnResize() override;
+	void OnResize() override;
 
 	/// Checks for necessary functional changes in the control as a result of changed attributes.
 	/// @param[in] changed_attributes The list of changed attributes.
 	/// @return True if no layout is required, false if the layout needs to be dirtied.
-	virtual bool OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
+	bool OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
 
 	/// Checks for necessary functional changes in the control as a result of the event.
 	/// @param[in] event The event to process.
-	virtual void ProcessDefaultAction(Core::Event& event) override;
+	void ProcessDefaultAction(Core::Event& event) override;
 
 	/// Sizes the dimensions to the element's inherent size.
 	/// @return True.
-	virtual bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
+	bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
 
 private:
 	WidgetSliderInput* widget;

Source/Controls/InputTypeSubmit.h

@@ -48,15 +48,15 @@ public:
 
 	/// Returns if this value should be submitted with the form.
 	/// @return True if the form control is to be submitted, false otherwise.
-	virtual bool IsSubmitted();
+	bool IsSubmitted() override;
 
 	/// Checks for necessary functional changes in the control as a result of the event.
 	/// @param[in] event The event to process.
-	virtual void ProcessDefaultAction(Core::Event& event) override;
+	void ProcessDefaultAction(Core::Event& event) override;
 
 	/// Sizes the dimensions to the element's inherent size.
 	/// @return False.
-	virtual bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions);
+	bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
 };
 
 }

Source/Controls/InputTypeText.h

@@ -55,29 +55,29 @@ public:
 	virtual ~InputTypeText();
 
 	/// Called every update from the host element.
-	virtual void OnUpdate() override;
+	void OnUpdate() override;
 
 	/// Called every render from the host element.
-	virtual void OnRender() override;
+	void OnRender() override;
 
 	/// Called when the parent element's size changes.
-	virtual void OnResize() override;
+	void OnResize() override;
 
 	/// Checks for necessary functional changes in the control as a result of changed attributes.
 	/// @param[in] changed_attributes The list of changed attributes.
 	/// @return True if no layout is required, false if the layout needs to be dirtied.
-	virtual bool OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
+	bool OnAttributeChange(const Core::ElementAttributes& changed_attributes) override;
 	/// Called when properties on the control are changed.
 	/// @param[in] changed_properties The properties changed on the element.
-	virtual void OnPropertyChange(const Core::PropertyNameList& changed_properties) override;
+	void OnPropertyChange(const Core::PropertyNameList& changed_properties) override;
 
 	/// Checks for necessary functional changes in the control as a result of the event.
 	/// @param[in] event The event to process.
-	virtual void ProcessDefaultAction(Core::Event& event) override;
+	void ProcessDefaultAction(Core::Event& event) override;
 
 	/// Sizes the dimensions to the element's inherent size.
 	/// @return True.
-	virtual bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
+	bool GetIntrinsicDimensions(Rml::Core::Vector2f& dimensions) override;
 
 private:
 	int size;

Source/Controls/Lua/LuaDataFormatter.h

@@ -42,7 +42,7 @@ public:
     LuaDataFormatter(const Rml::Core::String& name = "");
     ~LuaDataFormatter();
 
-    virtual void FormatData(Rml::Core::String& formatted_data, const Rml::Core::StringList& raw_data);
+    void FormatData(Rml::Core::String& formatted_data, const Rml::Core::StringList& raw_data) override;
 
     //Helper function used to push on to the stack the table where the function ref should be stored
     static void PushDataFormatterFunctionTable(lua_State* L);

Source/Controls/Lua/LuaDataSource.h

@@ -49,11 +49,11 @@ public:
 	/// @param[in] table The name of the table to query.
 	/// @param[in] row_index The index of the desired row.
 	/// @param[in] columns The list of desired columns within the row.
-	virtual void GetRow(Rml::Core::StringList& row, const Rml::Core::String& table, int row_index, const Rml::Core::StringList& columns);
+	void GetRow(Rml::Core::StringList& row, const Rml::Core::String& table, int row_index, const Rml::Core::StringList& columns) override;
 	/// Fetches the number of rows within one of this data source's tables.
 	/// @param[in] table The name of the table to query.
 	/// @return The number of rows within the specified table. Returns -1 in case of an incorrect Lua function.
-	virtual int GetNumRows(const Rml::Core::String& table);
+	int GetNumRows(const Rml::Core::String& table) override;
 
     //make the protected members of DataSource public
     using DataSource::NotifyRowAdd;

Source/Controls/WidgetDropDown.h

@@ -93,7 +93,7 @@ public:
 	int GetNumOptions() const;
 
 	/// Processes the incoming event.
-	virtual void ProcessEvent(Core::Event& event) override;
+	void ProcessEvent(Core::Event& event) override;
 
 private:
 	typedef std::vector< SelectOption > OptionList;

Source/Controls/WidgetSlider.h

@@ -92,7 +92,7 @@ protected:
 	Core::Element* GetParent() const;
 
 	/// Handles events coming through from the slider's components.
-	virtual void ProcessEvent(Core::Event& event) override;
+	void ProcessEvent(Core::Event& event) override;
 
 	/// Called when the slider's bar position is set or dragged.
 	/// @param[in] bar_position The new position of the bar (0 representing the start of the track, 1 representing the end).

Source/Controls/WidgetSliderInput.h

@@ -70,23 +70,23 @@ protected:
 	/// Called when the slider's bar position is set or dragged.
 	/// @param bar_position[in] The new position of the bar (0 representing the start of the track, 1 representing the end).
 	/// @return The new position of the bar.
-	virtual float OnBarChange(float bar_position) override;
+	float OnBarChange(float bar_position) override;
 	/// Called when the slider is incremented by one 'line', either by the down / right key or a mouse-click on the
 	/// increment arrow.
 	/// @return The new position of the bar.
-	virtual float OnLineIncrement() override;
+	float OnLineIncrement() override;
 	/// Called when the slider is decremented by one 'line', either by the up / left key or a mouse-click on the
 	/// decrement arrow.
 	/// @return The new position of the bar.
-	virtual float OnLineDecrement() override;
+	float OnLineDecrement() override;
 	/// Called when the slider is incremented by one 'page', either by the page-up key or a mouse-click on the
 	/// track below / right of the bar.
 	/// @return The new position of the bar.
-	virtual float OnPageIncrement(float click_position) override;
+	float OnPageIncrement(float click_position) override;
 	/// Called when the slider is incremented by one 'page', either by the page-down key or a mouse-click on the
 	/// track above / left of the bar.
 	/// @return The new position of the bar.
-	virtual float OnPageDecrement(float click_position) override;
+	float OnPageDecrement(float click_position) override;
 
 private:
 	/// Clamps the new value, sets it on the slider and returns it as a number from 0 to 1, 0 being the minimum

Source/Controls/WidgetTextInput.h

@@ -88,7 +88,7 @@ public:
 protected:
 	/// Processes the "keydown" and "textinput" event to write to the input field, and the "focus" and
 	/// "blur" to set the state of the cursor.
-	virtual void ProcessEvent(Core::Event& event) override;
+	void ProcessEvent(Core::Event& event) override;
 
 	/// Adds a new character to the string at the cursor position.
 	/// @param[in] character The character to add to the string.

Source/Controls/WidgetTextInputMultiLine.h

@@ -50,9 +50,9 @@ protected:
 	/// Returns true if the given character is permitted in the input field, false if not.
 	/// @param[in] character The character to validate.
 	/// @return True if the character is allowed, false if not.
-	virtual bool IsCharacterValid(Rml::Core::word character);
+	bool IsCharacterValid(Rml::Core::word character) override;
 	/// Called when the user pressed enter.
-	virtual void LineBreak();		
+	void LineBreak() override;		
 };
 
 }

Source/Controls/WidgetTextInputSingleLine.h

@@ -48,15 +48,15 @@ public:
 
 	/// Sets the value of the text field. The value will be stripped of end-lines.
 	/// @param value[in] The new value to set on the text field.
-	virtual void SetValue(const Core::String& value);
+	void SetValue(const Core::String& value) override;
 
 protected:
 	/// Returns true if the given character is permitted in the input field, false if not.
 	/// @param[in] character The character to validate.
 	/// @return True if the character is allowed, false if not.
-	virtual bool IsCharacterValid(Rml::Core::word character);
+	bool IsCharacterValid(Rml::Core::word character) override;
 	/// Called when the user pressed enter.
-	virtual void LineBreak();
+	void LineBreak() override;
 
 	/// Strips all \n and \r characters from the string.
 	void SanitiseValue(Core::String& value);

Source/Controls/WidgetTextInputSingleLinePassword.h

@@ -46,7 +46,7 @@ public:
 
 	/// Sets the value of the password field.
 	/// @param value[in] The new password to set on the field.
-	virtual void SetValue(const Core::String& value);
+	void SetValue(const Core::String& value) override;
 };
 
 }

Source/Core/BitmapFont/FontParser.h

@@ -44,22 +44,22 @@ namespace BitmapFont {
 
 class FontParser : public BaseXMLParser
 {
-	public:
-		FontParser( BitmapFontDefinitions *face );
-		virtual ~FontParser();
+public:
+	FontParser( BitmapFontDefinitions *face );
+	virtual ~FontParser();
 
-		/// Called when the parser finds the beginning of an element tag.
-		void HandleElementStart(const String& name, const XMLAttributes& attributes) override;
-		/// Called when the parser finds the end of an element tag.
-		void HandleElementEnd(const String& name) override;
-		/// Called when the parser encounters data.
-		void HandleData(const String& data) override;
+	/// Called when the parser finds the beginning of an element tag.
+	void HandleElementStart(const String& name, const XMLAttributes& attributes) override;
+	/// Called when the parser finds the end of an element tag.
+	void HandleElementEnd(const String& name) override;
+	/// Called when the parser encounters data.
+	void HandleData(const String& data) override;
 
-	private:
-		FontParser();
-		BitmapFontDefinitions *bm_face;
-		int char_id;
-		int kern_id;
+private:
+	FontParser();
+	BitmapFontDefinitions *bm_face;
+	int char_id;
+	int kern_id;
 };
 
 }

Source/Core/ElementHandle.h

@@ -50,8 +50,8 @@ public:
 	virtual ~ElementHandle();
 
 protected:
-	virtual void OnAttributeChange(const ElementAttributes& changed_attributes) override;
-	virtual void ProcessDefaultAction(Event& event) override;
+	void OnAttributeChange(const ElementAttributes& changed_attributes) override;
+	void ProcessDefaultAction(Event& event) override;
 
 	Vector2i drag_start;
 	Vector2f move_original_position;

Source/Core/ElementImage.h

@@ -73,22 +73,22 @@ public:
 	/// Returns the element's inherent size.
 	/// @param[out] The element's intrinsic dimensions.
 	/// @return True.
-	bool GetIntrinsicDimensions(Vector2f& dimensions);
+	bool GetIntrinsicDimensions(Vector2f& dimensions) override;
 
 protected:
 	/// Renders the image.
-	virtual void OnRender() override;
+	void OnRender() override;
 
 	/// Regenerates the element's geometry.
-	virtual void OnResize() override;
+	void OnResize() override;
 
 	/// Checks for changes to the image's source or dimensions.
 	/// @param[in] changed_attributes A list of attributes changed on the element.
-	virtual void OnAttributeChange(const ElementAttributes& changed_attributes) override;
+	void OnAttributeChange(const ElementAttributes& changed_attributes) override;
 
 	/// Called when properties on the element are changed.
 	/// @param[in] changed_properties The properties changed on the element.
-	virtual void OnPropertyChange(const PropertyNameList& changed_properties) override;
+	void OnPropertyChange(const PropertyNameList& changed_properties) override;
 
 private:
 	// Generates the element's geometry.

Source/Core/ElementStyle.cpp

@@ -865,6 +865,9 @@ DirtyPropertyList ElementStyle::ComputeValues(Style::ComputedValues& values, con
 				}
 			}
 			break;
+
+		default:
+			break;
 		}
 	}
 

Source/Core/ElementTextDefault.h

@@ -46,16 +46,16 @@ public:
 	ElementTextDefault(const String& tag);
 	virtual ~ElementTextDefault();
 
-	virtual void SetText(const WString& text);
-	virtual const WString& GetText() const;
+	void SetText(const WString& text) override;
+	const WString& GetText() const override;
 
-	virtual void OnRender();
+	void OnRender() override;
 
 	/// Generates a token of text from this element, returning only the width.
 	/// @param[out] token_width The window (in pixels) of the token.
 	/// @param[in] token_begin The first character to be included in the token.
 	/// @return True if the token is the end of the element's text, false if not.
-	virtual bool GenerateToken(float& token_width, int token_begin);
+	bool GenerateToken(float& token_width, int token_begin) override;
 	/// Generates a line of text rendered from this element
 	/// @param[out] line The characters making up the line, with white-space characters collapsed and endlines processed appropriately.
 	/// @param[out] line_length The number of characters from the source string consumed making up this string; this may very well be different from line.size()!
@@ -65,27 +65,27 @@ public:
 	/// @param[in] right_spacing_width The width (in pixels) of the spacing (consisting of margins, padding, etc) that must be remaining on the right of the line if the last of the text is rendered onto this line.
 	/// @param[in] trim_whitespace_prefix If we're collapsing whitespace, whether or remove all prefixing whitespace or collapse it down to a single space.
 	/// @return True if the line reached the end of the element's text, false if not.
-	virtual bool GenerateLine(WString& line, int& line_length, float& line_width, int line_begin, float maximum_line_width, float right_spacing_width, bool trim_whitespace_prefix);
+	bool GenerateLine(WString& line, int& line_length, float& line_width, int line_begin, float maximum_line_width, float right_spacing_width, bool trim_whitespace_prefix) override;
 
 	/// Clears all lines of generated text and prepares the element for generating new lines.
-	virtual void ClearLines();
+	void ClearLines() override;
 	/// Adds a new line into the text element.
 	/// @param[in] line_position The position of this line, as an offset from the first line.
 	/// @param[in] line The contents of the line..
-	virtual void AddLine(const Vector2f& line_position, const WString& line);
+	void AddLine(const Vector2f& line_position, const WString& line) override;
 
 	/// Prevents the element from dirtying its document's layout when its text is changed.
-	virtual void SuppressAutoLayout();
+	void SuppressAutoLayout() override;
 
 protected:
-	virtual void OnPropertyChange(const PropertyNameList& properties);
+	void OnPropertyChange(const PropertyNameList& properties) override;
 
 	/// Returns the RML of this element
 	/// @param content[out] The raw text.
-	virtual void GetRML(String& content);
+	void GetRML(String& content) override;
 
 	/// Forces a reevaluation of applicable font effects.
-	virtual void DirtyFont();
+	void DirtyFont() override;
 
 private:
 	// Updates the configuration this element uses for its font, depending on which font effects

Source/Core/LayoutInlineBoxText.h

@@ -50,28 +50,28 @@ public:
 
 	/// Returns true if this box is capable of overflowing, or if it must be rendered on a single line.
 	/// @return True if this box can overflow, false otherwise.
-	virtual bool CanOverflow() const;
+	bool CanOverflow() const override;
 
 	/// Flows the inline box's content into its parent line.
 	/// @param[in] first_box True if this box is the first box containing content to be flowed into this line.
 	/// @param available_width[in] The width available for flowing this box's content. This is measured from the left side of this box's content area.
 	/// @param right_spacing_width[in] The width of the spacing that must be left on the right of the element if no overflow occurs. If overflow occurs, then the entire width can be used.
 	/// @return The overflow box containing any content that spilled over from the flow. This must be nullptr if no overflow occured.
-	virtual LayoutInlineBox* FlowContent(bool first_box, float available_width, float right_spacing_width);
+	LayoutInlineBox* FlowContent(bool first_box, float available_width, float right_spacing_width) override;
 
 	/// Computes and sets the vertical position of this element, relative to its parent inline box (or block box,
 	/// for an un-nested inline box).
 	/// @param ascender[out] The maximum ascender of this inline box and all of its children.
 	/// @param descender[out] The maximum descender of this inline box and all of its children.
-	virtual void CalculateBaseline(float& ascender, float& descender);
+	void CalculateBaseline(float& ascender, float& descender) override;
 	/// Offsets the baseline of this box, and all of its children, by the ascender of the parent line box.
 	/// @param ascender[in] The ascender of the line box.
-	virtual void OffsetBaseline(float ascender);
+	void OffsetBaseline(float ascender) override;
 
 	/// Positions the inline box's element.
-	virtual void PositionElement();
+	void PositionElement() override;
 	/// Sizes the inline box's element.
-	virtual void SizeElement(bool split);
+	void SizeElement(bool split) override;
 
 	void* operator new(size_t size);
 	void operator delete(void* chunk);

Source/Core/Lua/LuaDocument.h

@@ -41,7 +41,7 @@ class LuaDocument : public ElementDocument
 {
 public:
     LuaDocument(const String& tag);
-    virtual void LoadScript(Stream* stream, const String& source_name);
+    void LoadScript(Stream* stream, const String& source_name) override;
 };
 
 }

Source/Core/PropertyParserColour.h

@@ -52,10 +52,10 @@ public:
 	/// @param[in] value The raw value defined for this property.
 	/// @param[in] parameters The parameters defined for this property; not used for this parser.
 	/// @return True if the value was parsed successfully, false otherwise.
-	virtual bool ParseValue(Property& property, const String& value, const ParameterMap& parameters) const;
+	bool ParseValue(Property& property, const String& value, const ParameterMap& parameters) const override;
 
 	/// Destroys the parser.
-	virtual void Release();
+	void Release() override;
 
 private:
 	typedef UnorderedMap< String, Colourb> ColourMap;

Source/Core/PropertyParserKeyword.h

@@ -51,7 +51,7 @@ public:
 	/// @param[in] value The raw value defined for this property.
 	/// @param[in] parameters The parameters defined for this property.
 	/// @return True if the value was validated successfully, false otherwise.
-	virtual bool ParseValue(Property& property, const String& value, const ParameterMap& parameters) const;
+	bool ParseValue(Property& property, const String& value, const ParameterMap& parameters) const override;
 
 	// Destroys the parser.
 	void Release();

Source/Core/PropertyParserNumber.h

@@ -51,7 +51,7 @@ public:
 	/// @param[in] value The raw value defined for this property.
 	/// @param[in] parameters The parameters defined for this property.
 	/// @return True if the value was validated successfully, false otherwise.
-	virtual bool ParseValue(Property& property, const String& value, const ParameterMap& parameters) const;
+	bool ParseValue(Property& property, const String& value, const ParameterMap& parameters) const override;
 
 	// Destroys the parser.
 	void Release();

Source/Core/PropertyParserString.h

@@ -51,7 +51,7 @@ public:
 	/// @param[in] value The raw value defined for this property.
 	/// @param[in] parameters The parameters defined for this property; not used for this parser.
 	/// @return True if the value was validated successfully, false otherwise.
-	virtual bool ParseValue(Property& property, const String& value, const ParameterMap& parameters) const;
+	bool ParseValue(Property& property, const String& value, const ParameterMap& parameters) const override;
 
 	// Destroys the parser.
 	void Release();

Source/Core/PropertyParserTransform.h

@@ -54,7 +54,7 @@ public:
 	/// @param[in] value The raw value defined for this property.
 	/// @param[in] parameters The parameters defined for this property.
 	/// @return True if the value was validated successfully, false otherwise.
-	virtual bool ParseValue(Property& property, const String& value, const ParameterMap& parameters) const;
+	bool ParseValue(Property& property, const String& value, const ParameterMap& parameters) const override;
 
 	// Destroys the parser.
 	void Release();

Source/Core/StyleSheetNodeSelectorEmpty.h

@@ -47,7 +47,7 @@ public:
 	virtual ~StyleSheetNodeSelectorEmpty();
 
 	// Returns true if the element has no DOM children.
-	virtual bool IsApplicable(const Element* element, int a, int b);
+	bool IsApplicable(const Element* element, int a, int b) override;
 };
 
 }

Source/Core/StyleSheetNodeSelectorFirstChild.h

@@ -47,7 +47,7 @@ public:
 	virtual ~StyleSheetNodeSelectorFirstChild();
 
 	// Returns true if the element is the first DOM child in its parent.
-	virtual bool IsApplicable(const Element* element, int a, int b);
+	bool IsApplicable(const Element* element, int a, int b) override;
 };
 
 }

Source/Core/StyleSheetNodeSelectorFirstOfType.h

@@ -47,7 +47,7 @@ public:
 	virtual ~StyleSheetNodeSelectorFirstOfType();
 
 	/// Returns true if the element is the first DOM child in its parent of its type.
-	virtual bool IsApplicable(const Element* element, int a, int b);
+	bool IsApplicable(const Element* element, int a, int b) override;
 };
 
 }

Source/Core/StyleSheetNodeSelectorLastChild.h

@@ -47,7 +47,7 @@ public:
 	virtual ~StyleSheetNodeSelectorLastChild();
 
 	// Returns true if the element is the last DOM child in its parent.
-	virtual bool IsApplicable(const Element* element, int a, int b);
+	bool IsApplicable(const Element* element, int a, int b) override;
 };
 
 }

Source/Core/StyleSheetNodeSelectorLastOfType.h

@@ -47,7 +47,7 @@ public:
 	virtual ~StyleSheetNodeSelectorLastOfType();
 
 	// Returns true if the element is the last DOM child in its parent.
-	virtual bool IsApplicable(const Element* element, int a, int b);
+	bool IsApplicable(const Element* element, int a, int b) override;
 };
 
 }

Source/Core/StyleSheetNodeSelectorNthChild.h

@@ -47,7 +47,7 @@ public:
 	virtual ~StyleSheetNodeSelectorNthChild();
 
 	// Returns true if the element index is (n * a) + b for a given integer value of n.
-	virtual bool IsApplicable(const Element* element, int a, int b);
+	bool IsApplicable(const Element* element, int a, int b) override;
 };
 
 }

Source/Core/StyleSheetNodeSelectorNthLastChild.h

@@ -47,7 +47,7 @@ public:
 	virtual ~StyleSheetNodeSelectorNthLastChild();
 
 	// Returns true if the element's reverse index is (n * a) + b for a given integer value of n.
-	virtual bool IsApplicable(const Element* element, int a, int b);
+	bool IsApplicable(const Element* element, int a, int b) override;
 };
 
 }

Source/Core/StyleSheetNodeSelectorNthLastOfType.h

@@ -47,7 +47,7 @@ public:
 	virtual ~StyleSheetNodeSelectorNthLastOfType();
 
 	// Returns true if the element index is (n * a) + b for a given integer value of n.
-	virtual bool IsApplicable(const Element* element, int a, int b);
+	bool IsApplicable(const Element* element, int a, int b) override;
 };
 
 }

Source/Core/StyleSheetNodeSelectorNthOfType.h

@@ -47,7 +47,7 @@ public:
 	virtual ~StyleSheetNodeSelectorNthOfType();
 
 	// Returns true if the element index is (n * a) + b for a given integer value of n.
-	virtual bool IsApplicable(const Element* element, int a, int b);
+	bool IsApplicable(const Element* element, int a, int b) override;
 };
 
 }

Source/Core/StyleSheetNodeSelectorOnlyChild.h

@@ -47,7 +47,7 @@ public:
 	virtual ~StyleSheetNodeSelectorOnlyChild();
 
 	// Returns true if the element is the only non-trivial DOM child of its parent.
-	virtual bool IsApplicable(const Element* element, int a, int b);
+	bool IsApplicable(const Element* element, int a, int b) override;
 };
 
 }

Source/Core/StyleSheetNodeSelectorOnlyOfType.h

@@ -47,7 +47,7 @@ public:
 	virtual ~StyleSheetNodeSelectorOnlyOfType();
 
 	// Returns true if the element is the only DOM child of its parent of its type.
-	virtual bool IsApplicable(const Element* element, int a, int b);
+	bool IsApplicable(const Element* element, int a, int b) override;
 };
 
 }

Source/Core/WidgetSlider.h

@@ -91,7 +91,7 @@ protected:
 	Element* GetParent() const;
 
 	/// Handles events coming through from the slider's components.
-	virtual void ProcessEvent(Event& event) override;
+	void ProcessEvent(Event& event) override;
 
 	/// Called when the slider's bar position is set or dragged.
 	/// @param[in] bar_position The new position of the bar (0 representing the start of the track, 1 representing the end).

Source/Core/WidgetSliderScroll.h

@@ -69,23 +69,23 @@ protected:
 	/// Called when the slider's bar position is set or dragged.
 	/// @param bar_position[in] The new position of the bar (0 representing the start of the track, 1 representing the end).
 	/// @return The new position of the bar.
-	virtual float OnBarChange(float bar_position);
+	float OnBarChange(float bar_position) override;
 	/// Called when the slider is incremented by one 'line', either by the down / right key or a mouse-click on the
 	/// increment arrow.
 	/// @return The new position of the bar.
-	virtual float OnLineIncrement();
+	float OnLineIncrement() override;
 	/// Called when the slider is decremented by one 'line', either by the up / left key or a mouse-click on the
 	/// decrement arrow.
 	/// @return The new position of the bar.
-	virtual float OnLineDecrement();
+	float OnLineDecrement() override;
 	/// Called when the slider is incremented by one 'page', either by the page-up key or a mouse-click on the
 	/// track below / right of the bar.
 	/// @return The new position of the bar.
-	virtual float OnPageIncrement(float click_position);
+	float OnPageIncrement(float click_position) override;
 	/// Called when the slider is incremented by one 'page', either by the page-down key or a mouse-click on the
 	/// track above / left of the bar.
 	/// @return The new position of the bar.
-	virtual float OnPageDecrement(float click_position);
+	float OnPageDecrement(float click_position) override;
 
 private:
 	// Returns the bar position after scrolling for a number of pixels.

Source/Debugger/SystemInterface.h

@@ -53,37 +53,37 @@ public:
 
 	/// Get the number of seconds elapsed since the start of the application.
 	/// @return Elapsed time, in seconds.
-	virtual double GetElapsedTime();
+	double GetElapsedTime() override;
 
 	/// Translate the input string into the translated string.
 	/// @param[out] translated Translated string ready for display.
 	/// @param[in] input String as received from XML.
 	/// @return Number of translations that occured.
-	virtual int TranslateString(Core::String& translated, const Core::String& input);
+	int TranslateString(Core::String& translated, const Core::String& input) override;
 
 	/// Log the specified message.
 	/// @param[in] type Type of log message, ERROR, WARNING, etc.
 	/// @param[in] message Message to log.
 	/// @return True to continue execution, false to break into the debugger.
-	virtual bool LogMessage(Core::Log::Type type, const Core::String& message);
+	bool LogMessage(Core::Log::Type type, const Core::String& message) override;
 
 	/// Set mouse cursor.
 	/// @param[in] cursor_name Cursor name to activate.
-	virtual void SetMouseCursor(const Core::String& cursor_name);
+	void SetMouseCursor(const Core::String& cursor_name) override;
 
 	/// Set clipboard text.
 	/// @param[in] text Text to apply to clipboard.
-	virtual void SetClipboardText(const Core::WString& text);
+	void SetClipboardText(const Core::WString& text) override;
 
 	/// Get clipboard text.
 	/// @param[out] text Retrieved text from clipboard.
-	virtual void GetClipboardText(Core::WString& text);
+	void GetClipboardText(Core::WString& text) override;
 
 	/// Activate keyboard (for touchscreen devices)
-	virtual void ActivateKeyboard();
+	void ActivateKeyboard() override;
 	
 	/// Deactivate keyboard (for touchscreen devices)
-	virtual void DeactivateKeyboard();
+	void DeactivateKeyboard() override;
 private:
 	Core::SystemInterface* application_interface;
 	ElementLog* log;