From b5731fbe527507bc3e3e87b447d7dffa066d1869 Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Fri, 25 Aug 2017 15:54:50 +1100
Subject: [PATCH] GUI2: use find_widget overload returning a pointer when
 applicable

Instead of taking address-of the reference version.
---
 src/gui/dialogs/chat_log.cpp                     | 14 +++++++-------
 src/gui/dialogs/editor/edit_side.cpp             | 12 ++++++------
 src/gui/dialogs/file_dialog.cpp                  |  2 +-
 src/gui/dialogs/game_cache_options.cpp           |  6 +++---
 src/gui/dialogs/loading_screen.cpp               |  4 ++--
 src/gui/dialogs/lobby/player_info.cpp            |  6 +++---
 src/gui/dialogs/lua_interpreter.cpp              | 10 +++++-----
 .../dialogs/multiplayer/mp_alerts_options.cpp    | 16 ++++++++--------
 src/gui/dialogs/preferences_dialog.cpp           |  6 +++---
 9 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/gui/dialogs/chat_log.cpp b/src/gui/dialogs/chat_log.cpp
index 9bc07c53d8cb..3d97641deb54 100644
--- a/src/gui/dialogs/chat_log.cpp
+++ b/src/gui/dialogs/chat_log.cpp
@@ -390,28 +390,28 @@ class chat_log::view
 	void bind(window& window)
 	{
 		LOG_CHAT_LOG << "Entering chat_log::view::bind" << std::endl;
-		model_.msg_label = &find_widget<styled_widget>(&window, "msg", false);
+		model_.msg_label = find_widget<styled_widget>(&window, "msg", false, true);
 		model_.page_number
-				= &find_widget<slider>(&window, "page_number", false);
+				= find_widget<slider>(&window, "page_number", false, true);
 		connect_signal_notify_modified(
 				*model_.page_number,
 				std::bind(&view::handle_page_number_changed, this));
 
 		model_.previous_page
-				= &find_widget<button>(&window, "previous_page", false);
+				= find_widget<button>(&window, "previous_page", false, true);
 		model_.previous_page->connect_click_handler(
 				std::bind(&view::previous_page, this));
 
-		model_.next_page = &find_widget<button>(&window, "next_page", false);
+		model_.next_page = find_widget<button>(&window, "next_page", false, true);
 		model_.next_page->connect_click_handler(
 				std::bind(&view::next_page, this));
 
-		model_.filter = &find_widget<text_box>(&window, "filter", false);
+		model_.filter = find_widget<text_box>(&window, "filter", false, true);
 		model_.filter->set_text_changed_callback(
 				std::bind(&view::filter, this));
 		window.keyboard_capture(model_.filter);
 
-		model_.copy_button = &find_widget<button>(&window, "copy", false);
+		model_.copy_button = find_widget<button>(&window, "copy", false, true);
 		connect_signal_mouse_left_click(
 				*model_.copy_button,
 				std::bind(&view::handle_copy_button_clicked,
@@ -422,7 +422,7 @@ class chat_log::view
 			model_.copy_button->set_tooltip(_("Clipboard support not found, contact your packager"));
 		}
 
-		model_.page_label = &find_widget<styled_widget>(&window, "page_label", false);
+		model_.page_label = find_widget<styled_widget>(&window, "page_label", false, true);
 
 		LOG_CHAT_LOG << "Exiting chat_log::view::bind" << std::endl;
 	}
diff --git a/src/gui/dialogs/editor/edit_side.cpp b/src/gui/dialogs/editor/edit_side.cpp
index 5e6689392894..38dba8603397 100644
--- a/src/gui/dialogs/editor/edit_side.cpp
+++ b/src/gui/dialogs/editor/edit_side.cpp
@@ -76,15 +76,15 @@ editor_edit_side::editor_edit_side(editor::editor_team_info& info)
 
 void editor_edit_side::pre_show(window& window)
 {
-	controller_group.add_member(&find_widget<toggle_button>(&window, "controller_human", false), team::CONTROLLER::HUMAN);
-	controller_group.add_member(&find_widget<toggle_button>(&window, "controller_ai", false),    team::CONTROLLER::AI);
-	controller_group.add_member(&find_widget<toggle_button>(&window, "controller_null", false),  team::CONTROLLER::EMPTY);
+	controller_group.add_member(find_widget<toggle_button>(&window, "controller_human", false, true), team::CONTROLLER::HUMAN);
+	controller_group.add_member(find_widget<toggle_button>(&window, "controller_ai", false, true),    team::CONTROLLER::AI);
+	controller_group.add_member(find_widget<toggle_button>(&window, "controller_null", false, true),  team::CONTROLLER::EMPTY);
 
 	controller_group.set_member_states(controller_);
 
-	vision_group.add_member(&find_widget<toggle_button>(&window, "vision_all", false),    team::SHARE_VISION::ALL);
-	vision_group.add_member(&find_widget<toggle_button>(&window, "vision_shroud", false), team::SHARE_VISION::SHROUD);
-	vision_group.add_member(&find_widget<toggle_button>(&window, "vision_null", false),   team::SHARE_VISION::NONE);
+	vision_group.add_member(find_widget<toggle_button>(&window, "vision_all", false, true),    team::SHARE_VISION::ALL);
+	vision_group.add_member(find_widget<toggle_button>(&window, "vision_shroud", false, true), team::SHARE_VISION::SHROUD);
+	vision_group.add_member(find_widget<toggle_button>(&window, "vision_null", false, true),   team::SHARE_VISION::NONE);
 
 	vision_group.set_member_states(share_vision_);
 
diff --git a/src/gui/dialogs/file_dialog.cpp b/src/gui/dialogs/file_dialog.cpp
index 0493ee393358..f2c28cf0f364 100644
--- a/src/gui/dialogs/file_dialog.cpp
+++ b/src/gui/dialogs/file_dialog.cpp
@@ -260,7 +260,7 @@ void file_dialog::pre_show(window& window)
 
 	refresh_fileview(window);
 
-	window.keyboard_capture(&find_widget<text_box>(&window, "filename", false));
+	window.keyboard_capture(find_widget<text_box>(&window, "filename", false, true));
 	window.add_to_keyboard_chain(&filelist);
 	window.set_exit_hook(std::bind(&file_dialog::on_exit, this, std::ref(window)));
 }
diff --git a/src/gui/dialogs/game_cache_options.cpp b/src/gui/dialogs/game_cache_options.cpp
index 599773b077ba..c598f075da55 100644
--- a/src/gui/dialogs/game_cache_options.cpp
+++ b/src/gui/dialogs/game_cache_options.cpp
@@ -87,9 +87,9 @@ game_cache_options::game_cache_options()
 
 void game_cache_options::pre_show(window& window)
 {
-	clean_button_ = &find_widget<button>(&window, "clean", false);
-	purge_button_ = &find_widget<button>(&window, "purge", false);
-	size_label_ = &find_widget<label>(&window, "size", false);
+	clean_button_ = find_widget<button>(&window, "clean", false, true);
+	purge_button_ = find_widget<button>(&window, "purge", false, true);
+	size_label_ = find_widget<label>(&window, "size", false, true);
 
 	update_cache_size_display();
 
diff --git a/src/gui/dialogs/loading_screen.cpp b/src/gui/dialogs/loading_screen.cpp
index 988094f1c0f7..fd3c2a39945d 100644
--- a/src/gui/dialogs/loading_screen.cpp
+++ b/src/gui/dialogs/loading_screen.cpp
@@ -125,8 +125,8 @@ void loading_screen::pre_show(window& window)
 
 	timer_id_ = add_timer(100, std::bind(&loading_screen::timer_callback, this, std::ref(window)), true);
 	cursor_setter_.reset(new cursor::setter(cursor::WAIT));
-	progress_stage_label_ = &find_widget<label>(&window, "status", false);
-	animation_label_ = &find_widget<label>(&window, "test_animation", false);
+	progress_stage_label_ = find_widget<label>(&window, "status", false, true);
+	animation_label_ = find_widget<label>(&window, "test_animation", false, true);
 
 	window.set_enter_disabled(true);
 	window.set_escape_disabled(true);
diff --git a/src/gui/dialogs/lobby/player_info.cpp b/src/gui/dialogs/lobby/player_info.cpp
index 0a3f807cfd11..254939b73db5 100644
--- a/src/gui/dialogs/lobby/player_info.cpp
+++ b/src/gui/dialogs/lobby/player_info.cpp
@@ -61,18 +61,18 @@ void lobby_player_info::pre_show(window& window)
 						this,
 						std::ref(window)));
 
-	add_to_friends_ = &find_widget<button>(&window, "add_to_friends", false);
+	add_to_friends_ = find_widget<button>(&window, "add_to_friends", false, true);
 	connect_signal_mouse_left_click(
 			*add_to_friends_,
 			std::bind(&lobby_player_info::add_to_friends_button_callback, this));
 
-	add_to_ignores_ = &find_widget<button>(&window, "add_to_ignores", false);
+	add_to_ignores_ = find_widget<button>(&window, "add_to_ignores", false, true);
 	connect_signal_mouse_left_click(
 			*add_to_ignores_,
 			std::bind(&lobby_player_info::add_to_ignores_button_callback, this));
 
 	remove_from_list_
-			= &find_widget<button>(&window, "remove_from_list", false);
+			= find_widget<button>(&window, "remove_from_list", false, true);
 	connect_signal_mouse_left_click(
 			*remove_from_list_,
 			std::bind(&lobby_player_info::remove_from_list_button_callback, this));
diff --git a/src/gui/dialogs/lua_interpreter.cpp b/src/gui/dialogs/lua_interpreter.cpp
index 2020b45563d8..5b20010e7fd6 100644
--- a/src/gui/dialogs/lua_interpreter.cpp
+++ b/src/gui/dialogs/lua_interpreter.cpp
@@ -88,7 +88,7 @@ class lua_interpreter::view {
 
 	/** Bind the scroll label widget to my pointer, and configure */
 	void bind(window& window) {
-		msg_label = &find_widget<scroll_label>(&window, "msg", false);
+		msg_label = find_widget<scroll_label>(&window, "msg", false, true);
 		msg_label->set_use_markup(true);
 		msg_label->set_vertical_scrollbar_mode(scrollbar_container::ALWAYS_VISIBLE);
 		msg_label->set_label("");
@@ -448,7 +448,7 @@ void lua_interpreter::controller::bind(window& window)
 	assert(view_);
 	view_->bind(window);
 
-	text_entry = &find_widget<text_box>(&window, "text_entry", false);
+	text_entry = find_widget<text_box>(&window, "text_entry", false, true);
 	//text_entry->set_text_changed_callback(
 	//		std::bind(&view::filter, this, std::ref(window)));
 	window.keyboard_capture(text_entry);
@@ -464,14 +464,14 @@ void lua_interpreter::controller::bind(window& window)
 						_5,
 						std::ref(window)));
 
-	copy_button = &find_widget<button>(&window, "copy", false);
+	copy_button = find_widget<button>(&window, "copy", false, true);
 	connect_signal_mouse_left_click(
 			*copy_button,
 			std::bind(&lua_interpreter::controller::handle_copy_button_clicked,
 						this,
 						std::ref(window)));
 
-	clear_button = &find_widget<button>(&window, "clear", false);
+	clear_button = find_widget<button>(&window, "clear", false, true);
 	connect_signal_mouse_left_click(
 			*clear_button,
 			std::bind(&lua_interpreter::controller::handle_clear_button_clicked,
@@ -705,7 +705,7 @@ void lua_interpreter::pre_show(window& window)
 	register_text("text_entry", false, controller_->text_entry_, true);
 	controller_->bind(window);
 
-	label *kernel_type_label = &find_widget<label>(&window, "kernel_type", false);
+	label *kernel_type_label = find_widget<label>(&window, "kernel_type", false, true);
 	kernel_type_label->set_label(controller_->lua_model_->get_name());
 
 	controller_->update_view();
diff --git a/src/gui/dialogs/multiplayer/mp_alerts_options.cpp b/src/gui/dialogs/multiplayer/mp_alerts_options.cpp
index 20e720a1c14b..47dc9cebd197 100644
--- a/src/gui/dialogs/multiplayer/mp_alerts_options.cpp
+++ b/src/gui/dialogs/multiplayer/mp_alerts_options.cpp
@@ -65,7 +65,7 @@ namespace dialogs
 
 static toggle_button * setup_pref_toggle_button(const std::string & id, bool def, window & window)
 {
-	toggle_button * b = &find_widget<toggle_button>(&window, id, false);
+	toggle_button * b = find_widget<toggle_button>(&window, id, false, true);
 	b->set_value(preferences::get(id, def));
 
 	//ensure we have yes / no for the toggle button, so that the preference matches the toggle button for sure.
@@ -102,7 +102,7 @@ static void setup_item(const std::string & item, window & window)
 static void set_pref_and_button(const std::string & id, bool value, window & window)
 {
 	preferences::set(id,value);
-	toggle_button * button = &find_widget<toggle_button>(&window, id, false);
+	toggle_button * button = find_widget<toggle_button>(&window, id, false, true);
 	button->set_value(value);
 }
 
@@ -128,25 +128,25 @@ void mp_alerts_options::pre_show(window& window)
 	}
 
 	if (!desktop::notifications::available()) {
-		label * nlabel = &find_widget<label>(&window, "notification_label", false);
+		label * nlabel = find_widget<label>(&window, "notification_label", false, true);
 		nlabel->set_tooltip(_("This build of wesnoth does not include support for desktop notifications, contact your package manager"));
 	}
 
 	toggle_button * in_lobby;
-	in_lobby = &find_widget<toggle_button>(&window,"ready_for_start_lobby", false);
+	in_lobby = find_widget<toggle_button>(&window,"ready_for_start_lobby", false, true);
 	in_lobby->set_visible(widget::visibility::invisible);
 
-	in_lobby = &find_widget<toggle_button>(&window,"game_has_begun_lobby", false);
+	in_lobby = find_widget<toggle_button>(&window,"game_has_begun_lobby", false, true);
 	in_lobby->set_visible(widget::visibility::invisible);
 
-	in_lobby = &find_widget<toggle_button>(&window,"turn_changed_sound", false); // If we get a sound for this then don't remove this button
+	in_lobby = find_widget<toggle_button>(&window,"turn_changed_sound", false, true); // If we get a sound for this then don't remove this button
 	in_lobby->set_visible(widget::visibility::invisible);
 
-	in_lobby = &find_widget<toggle_button>(&window,"turn_changed_lobby", false);
+	in_lobby = find_widget<toggle_button>(&window,"turn_changed_lobby", false, true);
 	in_lobby->set_visible(widget::visibility::invisible);
 
 	button * defaults;
-	defaults = &find_widget<button>(&window,"revert_to_defaults", false);
+	defaults = find_widget<button>(&window,"revert_to_defaults", false, true);
 	connect_signal_mouse_left_click(*defaults, std::bind(&revert_to_default_pref_values, std::ref(window)));
 }
 
diff --git a/src/gui/dialogs/preferences_dialog.cpp b/src/gui/dialogs/preferences_dialog.cpp
index 24c5b0b1e3ab..532ee2acab35 100644
--- a/src/gui/dialogs/preferences_dialog.cpp
+++ b/src/gui/dialogs/preferences_dialog.cpp
@@ -482,9 +482,9 @@ void preferences_dialog::post_build(window& window)
 		whisper_friends_only, set_whisper_friends_only);
 
 	/* LOBBY JOIN NOTIFICATIONS */
-	lobby_joins_group.add_member(&find_widget<toggle_button>(&window, "lobby_joins_none", false), SHOW_NONE);
-	lobby_joins_group.add_member(&find_widget<toggle_button>(&window, "lobby_joins_friends", false), SHOW_FRIENDS);
-	lobby_joins_group.add_member(&find_widget<toggle_button>(&window, "lobby_joins_all", false), SHOW_ALL);
+	lobby_joins_group.add_member(find_widget<toggle_button>(&window, "lobby_joins_none", false, true), SHOW_NONE);
+	lobby_joins_group.add_member(find_widget<toggle_button>(&window, "lobby_joins_friends", false, true), SHOW_FRIENDS);
+	lobby_joins_group.add_member(find_widget<toggle_button>(&window, "lobby_joins_all", false, true), SHOW_ALL);
 
 	lobby_joins_group.set_member_states(static_cast<LOBBY_JOINS>(lobby_joins()));