GUI2: marked builders' virtual build() function overrides as such

src/gui/core/window_builder.hpp

@@ -120,8 +120,8 @@ public:
 	/** The widgets per grid cell. */
 	std::vector<builder_widget_ptr> widgets;
 
-	grid* build() const;
-	widget* build(const replacements_map& replacements) const;
+	virtual grid* build() const override;
+	virtual widget* build(const replacements_map& replacements) const override;
 
 	grid* build(grid* grid) const;
 	void build(grid& grid, const replacements_map& replacements) const;

src/gui/core/window_builder/instance.hpp

@@ -28,9 +28,9 @@ struct builder_instance : public builder_widget
 {
 	explicit builder_instance(const config& cfg);
 
-	widget* build() const;
+	virtual widget* build() const override;
 
-	widget* build(const replacements_map& replacements) const;
+	virtual widget* build(const replacements_map& replacements) const override;
 
 	/**
 	 * Holds a copy of the cfg parameter in the constructor.

src/gui/widgets/addon_list.hpp

@@ -216,7 +216,7 @@ public:
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 private:
 	widget::visibility install_status_visibility_;

src/gui/widgets/button.hpp

@@ -147,7 +147,7 @@ public:
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 private:
 	std::string retval_id_;

src/gui/widgets/chatbox.hpp

@@ -283,7 +283,7 @@ public:
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 private:
 };

src/gui/widgets/drawing.hpp

@@ -135,7 +135,7 @@ struct builder_drawing : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	/** The width of the widget. */
 	typed_formula<unsigned> width;

src/gui/widgets/horizontal_scrollbar.hpp

@@ -108,7 +108,7 @@ struct builder_horizontal_scrollbar : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 };
 
 } // namespace implementation

src/gui/widgets/image.hpp

@@ -125,7 +125,7 @@ struct builder_image : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 };
 
 } // namespace implementation

src/gui/widgets/label.hpp

@@ -182,7 +182,7 @@ struct builder_label : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	bool wrap;
 

src/gui/widgets/listbox.hpp

@@ -446,7 +446,7 @@ struct builder_listbox : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	scrollbar_container::scrollbar_mode vertical_scrollbar_mode;
 	scrollbar_container::scrollbar_mode horizontal_scrollbar_mode;
@@ -473,7 +473,7 @@ struct builder_horizontal_listbox : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	scrollbar_container::scrollbar_mode vertical_scrollbar_mode;
 	scrollbar_container::scrollbar_mode horizontal_scrollbar_mode;
@@ -497,7 +497,7 @@ struct builder_grid_listbox : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	scrollbar_container::scrollbar_mode vertical_scrollbar_mode;
 	scrollbar_container::scrollbar_mode horizontal_scrollbar_mode;

src/gui/widgets/matrix.hpp

@@ -259,7 +259,7 @@ struct builder_matrix : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	scrollbar_container::scrollbar_mode vertical_scrollbar_mode;
 	scrollbar_container::scrollbar_mode horizontal_scrollbar_mode;

src/gui/widgets/menu_button.hpp

@@ -166,7 +166,7 @@ public:
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 private:
 	std::vector<::config> options_;

src/gui/widgets/minimap.hpp

@@ -138,7 +138,7 @@ struct builder_minimap : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 };
 
 } // namespace implementation

src/gui/widgets/multi_page.hpp

@@ -244,7 +244,7 @@ struct builder_multi_page : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	std::map<std::string, builder_grid_const_ptr> builders;
 

src/gui/widgets/multimenu_button.hpp

@@ -210,7 +210,7 @@ public:
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 private:
 	unsigned max_shown_;

src/gui/widgets/pane.hpp

@@ -202,9 +202,9 @@ struct builder_pane : public builder_widget
 {
 	explicit builder_pane(const config& cfg);
 
-	widget* build() const;
+	virtual widget* build() const override;
 
-	widget* build(const replacements_map& replacements) const;
+	virtual widget* build(const replacements_map& replacements) const override;
 
 	placer_base::grow_direction grow_direction;
 

src/gui/widgets/panel.hpp

@@ -106,7 +106,7 @@ struct builder_panel : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	builder_grid_ptr grid;
 };

src/gui/widgets/password_box.hpp

@@ -83,7 +83,7 @@ public:
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 private:
 	std::string history_;

src/gui/widgets/progress_bar.hpp

@@ -102,7 +102,7 @@ struct builder_progress_bar : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 };
 
 } // namespace implementation

src/gui/widgets/repeating_button.hpp

@@ -147,7 +147,7 @@ public:
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 };
 
 } // namespace implementation

src/gui/widgets/scroll_label.hpp

@@ -143,7 +143,7 @@ struct builder_scroll_label : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	scrollbar_container::scrollbar_mode vertical_scrollbar_mode;
 	scrollbar_container::scrollbar_mode horizontal_scrollbar_mode;

src/gui/widgets/scrollbar_panel.hpp

@@ -88,7 +88,7 @@ struct builder_scrollbar_panel : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	scrollbar_container::scrollbar_mode vertical_scrollbar_mode;
 	scrollbar_container::scrollbar_mode horizontal_scrollbar_mode;

src/gui/widgets/size_lock.hpp

@@ -114,7 +114,7 @@ struct builder_size_lock : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	typed_formula<unsigned> width_;
 	typed_formula<unsigned> height_;

src/gui/widgets/slider.hpp

@@ -249,7 +249,7 @@ struct builder_slider : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 private:
 	unsigned best_slider_length_;

src/gui/widgets/spacer.hpp

@@ -115,7 +115,7 @@ struct builder_spacer : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 private:
 	// We store these as strings since they could contain formulas.

src/gui/widgets/stacked_widget.hpp

@@ -205,7 +205,7 @@ struct builder_stacked_widget : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	/** The builders for all layers of the stack .*/
 	std::vector<builder_grid> stack;

src/gui/widgets/text_box.hpp

@@ -323,7 +323,7 @@ public:
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	std::string history;
 

src/gui/widgets/toggle_button.hpp

@@ -169,7 +169,7 @@ struct builder_toggle_button : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 private:
 	std::string icon_name_;

src/gui/widgets/toggle_panel.hpp

@@ -209,7 +209,7 @@ struct builder_toggle_panel : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	builder_grid_ptr grid;
 

src/gui/widgets/tree_view.hpp

@@ -209,7 +209,7 @@ struct builder_tree_view : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 	scrollbar_container::scrollbar_mode vertical_scrollbar_mode;
 	scrollbar_container::scrollbar_mode horizontal_scrollbar_mode;

src/gui/widgets/unit_preview_pane.hpp

@@ -138,7 +138,7 @@ public:
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 
 private:
 	const std::string image_mods_;

src/gui/widgets/vertical_scrollbar.hpp

@@ -105,7 +105,7 @@ struct builder_vertical_scrollbar : public builder_styled_widget
 
 	using builder_styled_widget::build;
 
-	widget* build() const;
+	virtual widget* build() const override;
 };
 
 } // namespace implementation

src/gui/widgets/viewport.hpp

@@ -107,9 +107,9 @@ struct builder_viewport : public builder_widget
 {
 	explicit builder_viewport(const config& cfg);
 
-	widget* build() const;
+	virtual widget* build() const override;
 
-	widget* build(const replacements_map& replacements) const;
+	virtual widget* build(const replacements_map& replacements) const override;
 
 	builder_widget_ptr widget_;
 };

src/gui/widgets/window.cpp

@@ -98,7 +98,7 @@ public:
 
 	using builder_styled_widget::build;
 
-	widget* build() const
+	virtual widget* build() const override
 	{
 		return nullptr;
 	}