GUI2: marked inherited dialog functions (pre_show, etc) as virtual override

The virtual is for style consistency, the override because it should be done.

src/gui/dialogs/addon/connect.hpp

@@ -50,13 +50,13 @@ private:
 	void help_button_callback(window& window);
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 
 } // namespace dialogs

src/gui/dialogs/addon/install_dependencies.hpp

@@ -33,10 +33,10 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	addons_list addons_;
 };

src/gui/dialogs/addon/manager.hpp

@@ -53,10 +53,10 @@ private:
 	void on_addon_select(window& window);
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	void load_addon_list(window& window);
 

src/gui/dialogs/addon/uninstall_list.hpp

@@ -48,13 +48,13 @@ private:
 	std::map<std::string, bool> selections_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 
 } // namespace dialogs

src/gui/dialogs/advanced_graphics_options.hpp

@@ -45,13 +45,13 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 	void setup_scale_case(const std::string&, window&);
 	void update_scale_case(const std::string&);

src/gui/dialogs/attack_predictions.hpp

@@ -48,10 +48,10 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	struct combatant_data
 	{

src/gui/dialogs/campaign_difficulty.hpp

@@ -54,13 +54,13 @@ private:
 	std::string selected_difficulty_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 } // namespace dialogs
 } // namespace gui2

src/gui/dialogs/campaign_selection.hpp

@@ -55,15 +55,15 @@ private:
 	void campaign_selected(window& window);
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	void show_settings(CVideo& video);
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 	void mod_toggled(window& window);
 

src/gui/dialogs/campaign_settings.hpp

@@ -53,13 +53,13 @@ private:
 	void update_lists(window& window);
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 };
 

src/gui/dialogs/chat_log.cpp

@@ -355,7 +355,7 @@ public:
 	{
 	}
 
-	void pre_show()
+	virtual void pre_show()
 	{
 		LOG_CHAT_LOG << "Entering chat_log::view::pre_show" << std::endl;
 		controller_.update_view_from_model(true);

src/gui/dialogs/chat_log.hpp

@@ -37,13 +37,13 @@ public:
 	window* build_window(CVideo& video);
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	std::shared_ptr<view> get_view();
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	std::shared_ptr<view> view_;
 };

src/gui/dialogs/core_selection.hpp

@@ -45,13 +45,13 @@ private:
 	void core_selected(window& window);
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 	/** Contains the config objects for all cores. */
 	const std::vector<config>& cores_;

src/gui/dialogs/debug_clock.hpp

@@ -128,13 +128,13 @@ private:
 	time time_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(CVideo& video);
+	virtual void post_show(CVideo& video);
 
 	/**
 	 * The callback for the drawing routine.

src/gui/dialogs/depcheck_confirm_change.hpp

@@ -42,7 +42,7 @@ public:
 
 protected:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 
 } // namespace dialogs

src/gui/dialogs/depcheck_select_new.hpp

@@ -50,13 +50,13 @@ public:
 
 protected:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog */
-	virtual void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog */
-	virtual void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 private:
 	/** the options available */

src/gui/dialogs/drop_down_menu.hpp

@@ -81,13 +81,13 @@ private:
 	std::function<void()> callback_toggle_state_change_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 
 } // namespace dialogs

src/gui/dialogs/edit_label.hpp

@@ -50,7 +50,7 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 } // namespace dialogs
 } // namespace gui2

src/gui/dialogs/edit_text.hpp

@@ -60,7 +60,7 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 } // namespace dialogs
 } // namespace gui2

src/gui/dialogs/editor/custom_tod.hpp

@@ -71,13 +71,13 @@ private:
 	void update_selected_tod_info(window& window);
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 	/** Current map generator index */
 	int current_tod_;

src/gui/dialogs/editor/edit_label.hpp

@@ -62,7 +62,7 @@ private:
 	void save_color_component(uint8_t color_t::* component, const int value);
 	void register_color_component(std::string widget_id, uint8_t color_t::* component);
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 } // namespace dialogs
 } // namespace gui2

src/gui/dialogs/editor/edit_scenario.hpp

@@ -54,7 +54,7 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 } // namespace dialogs
 } // namespace gui2

src/gui/dialogs/editor/edit_side.hpp

@@ -40,8 +40,8 @@ public:
 	}
 
 private:
-	void pre_show(window& window);
-	void post_show(window& window);
+	virtual void pre_show(window& window) override;
+	virtual void post_show(window& window) override;
 
 	team::CONTROLLER& controller_;
 	group<team::CONTROLLER> controller_group;
@@ -50,7 +50,7 @@ private:
 	group<team::SHARE_VISION> vision_group;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 } // namespace dialogs
 } // namespace gui2

src/gui/dialogs/editor/generate_map.hpp

@@ -55,10 +55,10 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Callback for generator list selection changes. */
 	void do_generator_selected(window& window);

src/gui/dialogs/editor/generator_settings.hpp

@@ -38,12 +38,12 @@ public:
 	}
 
 private:
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	void adjust_minimum_size_by_players(window& window);
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** We need to own these fields to access the underlying widget */
 	field_integer* players_;

src/gui/dialogs/editor/new_map.hpp

@@ -49,7 +49,7 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 
 } // namespace dialogs

src/gui/dialogs/editor/resize_map.hpp

@@ -114,10 +114,10 @@ private:
 	void set_direction_icon(int index, std::string icon);
 
 	/** Inherited from modal_dialog */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 
 } // namespace dialogs

src/gui/dialogs/editor/set_starting_position.hpp

@@ -44,13 +44,13 @@ private:
 	std::vector<map_location> starting_positions_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 } // namespace dialogs
 } // namespace gui2

src/gui/dialogs/end_credits.hpp

@@ -44,10 +44,10 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	void timer_callback();
 	void key_press_callback(const SDL_Keycode key);

src/gui/dialogs/file_dialog.hpp

@@ -206,10 +206,10 @@ private:
 	int user_bookmarks_begin_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Handles dialog exit events and decides whether to proceed or not. */
 	bool on_exit(window& window);

src/gui/dialogs/folder_create.hpp

@@ -56,10 +56,10 @@ private:
 	}
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 };
 
 class bookmark_create

src/gui/dialogs/formula_debugger.hpp

@@ -36,10 +36,10 @@ public:
 
 private:
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/***** ***** button callbacks ***** *****/
 	void callback_continue_button(window& window);

src/gui/dialogs/game_cache_options.hpp

@@ -60,13 +60,13 @@ private:
 	void update_cache_size_display();
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 
 } // namespace dialogs

src/gui/dialogs/game_delete.hpp

@@ -35,7 +35,7 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 } // namespace dialogs
 } // namespace gui2

src/gui/dialogs/game_load.hpp

@@ -48,10 +48,10 @@ public:
 
 private:
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	void filter_text_changed(text_box_base* textbox, const std::string& text);
 	void delete_button_callback(window& window);

src/gui/dialogs/game_save.hpp

@@ -35,7 +35,7 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 
 class game_save_message : public modal_dialog
@@ -55,7 +55,7 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 
 class game_save_oos : public modal_dialog
@@ -77,7 +77,7 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 } // namespace dialogs
 } // namespace gui2

src/gui/dialogs/game_stats.hpp

@@ -63,13 +63,13 @@ private:
 	void on_tab_select(window& window);
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 
 } // namespace dialogs

src/gui/dialogs/game_version.hpp

@@ -75,10 +75,10 @@ private:
 	void generate_plain_text_report();
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	//
 	// Widget event callbacks.

src/gui/dialogs/gamestate_inspector.hpp

@@ -36,10 +36,10 @@ public:
 
 private:
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	std::shared_ptr<view> view_;
 	std::shared_ptr<model> model_;

src/gui/dialogs/help_browser.hpp

@@ -42,10 +42,10 @@ private:
 	const config& help_cfg_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	void on_topic_select(window& window);
 };

src/gui/dialogs/hotkey_bind.hpp

@@ -46,10 +46,10 @@ private:
 	void mouse_button_callback(window& window, Uint8 button);
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 };
 
 } // namespace dialogs

src/gui/dialogs/label_settings.hpp

@@ -40,10 +40,10 @@ private:
 	display_context& viewer;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Callback for toggling a checkbox state. */
 	void toggle_category(widget& box, std::string category);

src/gui/dialogs/language_selection.hpp

@@ -31,13 +31,13 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 
 } // namespace dialogs

src/gui/dialogs/loading_screen.hpp

@@ -71,15 +71,15 @@ private:
 
 	window* build_window(CVideo& video) const;
 
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	void timer_callback(window& window);
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 	label* progress_stage_label_;
 	label* animation_label_;

src/gui/dialogs/lobby/lobby.hpp

@@ -164,10 +164,10 @@ private:
 	virtual void post_build(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window) override;
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window) override;
+	virtual void post_show(window& window) override;
 
 	const config& game_config_;
 

src/gui/dialogs/lobby/player_info.hpp

@@ -45,13 +45,13 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 	void update_relation();
 

src/gui/dialogs/log_settings.hpp

@@ -49,13 +49,13 @@ private:
 	std::vector<std::string> domain_list_, widget_id_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 };
 

src/gui/dialogs/lua_interpreter.hpp

@@ -38,7 +38,7 @@ public:
 	window* build_window(CVideo& video);
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	enum WHICH_KERNEL { APP, GAME };
 	static void display(CVideo& video, lua_kernel_base * lk);
@@ -47,7 +47,7 @@ private:
 	const std::unique_ptr<controller> controller_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 
 } // namespace dialogs

src/gui/dialogs/message.hpp

@@ -110,10 +110,10 @@ public:
 
 protected:
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 private:
 	/** The title for the dialog. */
@@ -152,7 +152,7 @@ private:
 	std::vector<tbutton_status> buttons_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 } // namespace dialogs
 

src/gui/dialogs/multiplayer/faction_select.hpp

@@ -41,10 +41,10 @@ private:
 	group<std::string> gender_toggle_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Callbacks */
 	void on_faction_select(window& window);

src/gui/dialogs/multiplayer/mp_alerts_options.hpp

@@ -41,13 +41,13 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 
 } // namespace dialogs

src/gui/dialogs/multiplayer/mp_change_control.cpp

@@ -322,7 +322,7 @@ public:
 	{
 	}
 
-	void pre_show(window& window)
+	virtual void pre_show(window& window)
 	{
 		model_.clear_sides();
 		controller_.show_sides_list();
@@ -380,7 +380,7 @@ public:
 #endif
 	}
 
-	void post_show(int retval, events::menu_handler* mh)
+	virtual void post_show(int retval, events::menu_handler* mh)
 	{
 		if(retval == window::OK) {
 			controller_.change_control(mh);

src/gui/dialogs/multiplayer/mp_change_control.hpp

@@ -36,11 +36,11 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
-	void post_show(window& window);
+	virtual void pre_show(window& window) override;
+	virtual void post_show(window& window) override;
 
 	events::menu_handler* menu_handler_;
 	std::shared_ptr<view> view_;

src/gui/dialogs/multiplayer/mp_cmd_wrapper.hpp

@@ -60,10 +60,10 @@ private:
 	std::string time_;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 
 } // namespace dialogs

src/gui/dialogs/multiplayer/mp_connect.cpp

@@ -76,13 +76,13 @@ private:
 	std::string host_name_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 
 REGISTER_DIALOG(mp_server_list)

src/gui/dialogs/multiplayer/mp_connect.hpp

@@ -32,10 +32,10 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** The host name of the selected servef. */
 	field_text* host_name_;

src/gui/dialogs/multiplayer/mp_create_game.hpp

@@ -45,13 +45,13 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 	const config& cfg_;
 

src/gui/dialogs/multiplayer/mp_host_game_prompt.hpp

@@ -36,7 +36,7 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 } // namespace dialogs
 } // namespace gui2

src/gui/dialogs/multiplayer/mp_join_game.hpp

@@ -51,13 +51,13 @@ public:
 	bool started() const { return level_["started"].to_bool(); }
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 	void generate_side_list(window& window);
 

src/gui/dialogs/multiplayer/mp_join_game_password_prompt.hpp

@@ -44,7 +44,7 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 
 } // namespace dialogs

src/gui/dialogs/multiplayer/mp_login.hpp

@@ -29,13 +29,13 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 
 } // namespace dialogs

src/gui/dialogs/multiplayer/mp_method_selection.hpp

@@ -47,13 +47,13 @@ private:
 	int choice_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 
 } // namespace dialogs

src/gui/dialogs/multiplayer/mp_staging.hpp

@@ -44,13 +44,13 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 	void add_side_node(window& window, ng::side_engine_ptr side);
 

src/gui/dialogs/multiplayer/synced_choice_wait.hpp

@@ -34,10 +34,10 @@ private:
 	label* message_;
 	window* window_;
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	virtual void handle_generic_event(const std::string& event_name);
 };

src/gui/dialogs/network_transmission.hpp

@@ -84,10 +84,10 @@ public:
 
 protected:
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 private:
 	/**
@@ -99,7 +99,7 @@ private:
 	std::string subtitle_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 
 } // namespace dialogs

src/gui/dialogs/outro.hpp

@@ -46,13 +46,13 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 	void set_next_draw();
 

src/gui/dialogs/preferences_dialog.hpp

@@ -80,12 +80,12 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void post_build(window& window);
-	void pre_show(window& window);
-	void post_show(window& /*window*/);
+	virtual void post_build(window& window);
+	virtual void pre_show(window& window) override;
+	virtual void post_show(window& /*window*/);
 
 	/** Initializers */
 	void initialize_tabs(window& window, listbox& selector);

src/gui/dialogs/screenshot_notification.hpp

@@ -49,10 +49,10 @@ private:
 	const std::string screenshots_dir_path_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 };
 } // namespace dialogs
 } // namespace gui2

src/gui/dialogs/select_orb_colors.hpp

@@ -47,12 +47,12 @@ private:
 	std::map<std::string, group<std::string> > groups_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 
 } // namespace dialogs

src/gui/dialogs/simple_item_selector.hpp

@@ -89,13 +89,13 @@ private:
 	std::string ok_label_, cancel_label_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 } // namespace dialogs
 } // namespace gui2

src/gui/dialogs/sp_options_configure.hpp

@@ -72,13 +72,13 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 	ng::create_engine& create_engine_;
 	ng::configure_engine& config_engine_;

src/gui/dialogs/statistics_dialog.hpp

@@ -40,10 +40,10 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/**
 	 * Picks out the stats structure that was selected for displaying.

src/gui/dialogs/story_viewer.hpp

@@ -42,10 +42,10 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	void update_current_part_ptr();
 

src/gui/dialogs/terrain_layers.hpp

@@ -41,10 +41,10 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	terrain_builder::tile* tile_;
 	terrain_builder::tile::logs tile_logs_;

src/gui/dialogs/theme_list.hpp

@@ -51,13 +51,13 @@ private:
 	std::vector<theme_info> themes_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 } // namespace dialogs
 } // namespace gui2

src/gui/dialogs/title_screen.hpp

@@ -76,10 +76,10 @@ private:
 	bool redraw_background_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	void on_resize(window& window);
 

src/gui/dialogs/tooltip.cpp

@@ -108,10 +108,10 @@ private:
 	SDL_Rect source_rect_;
 
 	/** Inherited from modeless_dialog. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modeless_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 };
 
 void tooltip::pre_show(window& window)

src/gui/dialogs/transient_message.hpp

@@ -37,10 +37,10 @@ private:
 	bool hide_image_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	virtual void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 };
 } // namespace dialogs
 

src/gui/dialogs/unit_advance.hpp

@@ -35,11 +35,11 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
-	void post_show(window& window);
+	virtual void pre_show(window& window) override;
+	virtual void post_show(window& window) override;
 
 	void list_item_clicked(window& window);
 

src/gui/dialogs/unit_attack.hpp

@@ -41,13 +41,13 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 	void damage_calc_callback(window& window);
 

src/gui/dialogs/unit_create.hpp

@@ -66,13 +66,13 @@ private:
 	std::vector<std::string> last_words_;
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 
 	/** Callbacks */
 	void list_item_clicked(window& window);

src/gui/dialogs/unit_list.hpp

@@ -59,13 +59,13 @@ private:
 	void list_item_clicked(window& window);
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 
 } // namespace dialogs

src/gui/dialogs/unit_recall.hpp

@@ -63,13 +63,13 @@ private:
 	void show_help(window& window);
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 
 } // namespace dialogs

src/gui/dialogs/unit_recruit.hpp

@@ -36,11 +36,11 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
-	void post_show(window& window);
+	virtual void pre_show(window& window) override;
+	virtual void post_show(window& window) override;
 
 	void list_item_clicked(window& window);
 

src/gui/dialogs/wml_error.hpp

@@ -64,10 +64,10 @@ private:
 	std::string report_; // Plain text report for copying to clipboard.
 
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	void copy_report_callback();
 };

src/gui/dialogs/wml_message.hpp

@@ -126,11 +126,11 @@ private:
 
 protected:
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 private:
 	/** Inherited from modal_dialog. */
-	void post_show(window& window);
+	virtual void post_show(window& window) override;
 };
 
 /** Shows a dialog with the portrait on the left side. */
@@ -147,7 +147,7 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 
 /** Shows a dialog with the portrait on the right side. */
@@ -164,7 +164,7 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 };
 
 /** Shows a dialog with two portraits, one on each side. */
@@ -185,10 +185,10 @@ public:
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
-	virtual const std::string& window_id() const;
+	virtual const std::string& window_id() const override;
 
 	/** Inherited from modal_dialog. */
-	void pre_show(window& window);
+	virtual void pre_show(window& window) override;
 
 	std::string second_portrait_;