Clean up includes due to settings changes.

src/addon_management.cpp

@@ -27,6 +27,7 @@
 #include "gui/dialogs/addon_list.hpp"
 #include "gui/dialogs/message.hpp"
 #include "gui/dialogs/transient_message.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "log.hpp"
 #include "marked-up_text.hpp"

src/game.cpp

@@ -49,6 +49,7 @@
 #include "gui/widgets/debug.hpp"
 #endif
 #include "gui/auxiliary/event/handler.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "help.hpp"
 #include "hotkeys.hpp"

src/gui/auxiliary/window_builder.cpp

@@ -42,6 +42,7 @@
 #include "gui/auxiliary/window_builder/password_box.hpp"
 #include "gui/auxiliary/window_builder/toggle_panel.hpp"
 #include "gui/auxiliary/window_builder/vertical_scrollbar.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "formula_string_utils.hpp"
 

src/gui/dialogs/addon_connect.cpp

@@ -18,6 +18,7 @@
 
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/window.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/text_box.hpp"
 
 namespace gui2 {

src/gui/dialogs/addon_list.cpp

@@ -18,6 +18,7 @@
 
 #include "foreach.hpp"
 #include "gui/widgets/listbox.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 
 namespace gui2 {

src/gui/dialogs/editor_generate_map.cpp

@@ -19,6 +19,7 @@
 
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/label.hpp"
+#include "gui/widgets/settings.hpp"
 #include "mapgen.hpp"
 
 #define ERR_ED LOG_STREAM_INDENT(err, editor)

src/gui/dialogs/editor_new_map.cpp

@@ -15,6 +15,7 @@
 
 #include "gui/dialogs/editor_new_map.hpp"
 #include "gui/widgets/integer_selector.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/dialogs/field.hpp"
 
 namespace gui2 {

src/gui/dialogs/editor_resize_map.cpp

@@ -19,6 +19,7 @@
 #include "gui/dialogs/helper.hpp"
 #include "gui/widgets/label.hpp"
 #include "gui/widgets/toggle_button.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/slider.hpp"
 
 namespace gui2 {

src/gui/dialogs/editor_settings.cpp

@@ -21,6 +21,7 @@
 
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/label.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/slider.hpp"
 #include "gui/widgets/toggle_button.hpp"
 #include "gettext.hpp"

src/gui/dialogs/formula_debugger.cpp

@@ -18,6 +18,7 @@
 
 #include "gui/dialogs/helper.hpp"
 #include "gui/widgets/button.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "../../foreach.hpp"
 #include "../../formula_debugger.hpp"

src/gui/dialogs/game_load.cpp

@@ -28,6 +28,7 @@
 #include "gui/widgets/label.hpp"
 #include "gui/widgets/listbox.hpp"
 #include "gui/widgets/minimap.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/text_box.hpp"
 #include "gui/widgets/window.hpp"
 #include "language.hpp"

src/gui/dialogs/game_save.cpp

@@ -21,6 +21,7 @@
 #include "gui/dialogs/field.hpp"
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/label.hpp"
+#include "gui/widgets/settings.hpp"
 
 namespace gui2 {
 

src/gui/dialogs/gamestate_inspector.cpp

@@ -19,6 +19,7 @@
 #include "gui/dialogs/helper.hpp"
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/listbox.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 
 #include "../../foreach.hpp"

src/gui/dialogs/language_selection.cpp

@@ -18,6 +18,7 @@
 
 #include "foreach.hpp"
 #include "gui/widgets/listbox.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "language.hpp"
 #include "preferences.hpp"

src/gui/dialogs/lobby_main.cpp

@@ -27,6 +27,7 @@
 #include "gui/widgets/minimap.hpp"
 #include "gui/widgets/multi_page.hpp"
 #include "gui/widgets/scroll_label.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/text_box.hpp"
 #include "gui/widgets/toggle_button.hpp"
 #include "gui/widgets/toggle_panel.hpp"

src/gui/dialogs/lobby_player_info.cpp

@@ -16,6 +16,7 @@
 #include "gui/dialogs/lobby_player_info.hpp"
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/label.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/text_box.hpp"
 
 #include "game_preferences.hpp"

src/gui/dialogs/message.cpp

@@ -21,6 +21,7 @@
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/image.hpp"
 #include "gui/widgets/label.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "log.hpp"
 

src/gui/dialogs/mp_cmd_wrapper.cpp

@@ -19,6 +19,7 @@
 #include "gui/widgets/button.hpp"
 #include "gui/dialogs/field.hpp"
 #include "gui/widgets/label.hpp"
+#include "gui/widgets/settings.hpp"
 
 #include "game_preferences.hpp"
 

src/gui/dialogs/mp_connect.cpp

@@ -23,6 +23,7 @@
 #include "gui/widgets/listbox.hpp"
 #include "gui/widgets/label.hpp"
 #include "gui/widgets/password_box.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/scroll_label.hpp"
 #include "gui/widgets/toggle_button.hpp"
 

src/gui/dialogs/mp_create_game.cpp

@@ -24,6 +24,7 @@
 #include "gui/widgets/integer_selector.hpp"
 #include "gui/widgets/listbox.hpp"
 #include "gui/widgets/minimap.hpp"
+#include "gui/widgets/settings.hpp"
 #include "../../settings.hpp"
 
 namespace gui2 {

src/gui/dialogs/mp_method_selection.cpp

@@ -18,6 +18,7 @@
 
 #include "gui/widgets/listbox.hpp"
 #include "gui/widgets/window.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/text_box.hpp"
 #include "gui/widgets/toggle_button.hpp"
 #include "multiplayer.hpp"

src/gui/dialogs/title_screen.cpp

@@ -23,6 +23,7 @@
 #include "gui/dialogs/language_selection.hpp"
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/label.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "titlescreen.hpp"
 

src/gui/dialogs/transient_message.cpp

@@ -18,6 +18,7 @@
 
 #include "gettext.hpp"
 #include "gui/widgets/label.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "log.hpp"
 

src/gui/dialogs/unit_create.cpp

@@ -19,6 +19,7 @@
 #include "gui/auxiliary/log.hpp"
 #include "gui/dialogs/helper.hpp"
 #include "gui/widgets/listbox.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/toggle_button.hpp"
 #include "gui/widgets/window.hpp"
 #include "foreach.hpp"

src/gui/dialogs/wml_message.cpp

@@ -20,6 +20,7 @@
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/label.hpp"
 #include "gui/widgets/listbox.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/text_box.hpp"
 #include "gui/widgets/window.hpp"
 

src/gui/widgets/button.cpp

@@ -17,6 +17,7 @@
 #include "gui/widgets/button.hpp"
 
 #include "gui/auxiliary/log.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "sound.hpp"
 

src/gui/widgets/container.hpp

@@ -17,6 +17,7 @@
 
 #include "gui/widgets/grid.hpp"
 #include "gui/widgets/control.hpp"
+#include "gui/auxiliary/window_builder.hpp"
 
 namespace gui2 {
 

src/gui/widgets/control.cpp

@@ -19,6 +19,7 @@
 #include "font.hpp"
 #include "foreach.hpp"
 #include "gui/auxiliary/log.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "marked-up_text.hpp"
 

src/gui/widgets/control.hpp

@@ -16,7 +16,7 @@
 #define GUI_WIDGETS_CONTROL_HPP_INCLUDED
 
 #include "gui/auxiliary/canvas.hpp"
-#include "gui/widgets/settings.hpp"
+#include "gui/auxiliary/widget_definition.hpp"
 #include "gui/widgets/widget.hpp"
 #include "../../text.hpp"
 #include "tstring.hpp"

src/gui/widgets/panel.cpp

@@ -17,6 +17,7 @@
 #include "gui/widgets/panel.hpp"
 
 #include "gui/auxiliary/log.hpp"
+#include "gui/auxiliary/widget_definition/panel.hpp"
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
 #define LOG_HEADER LOG_SCOPE_HEADER + ':'

src/gui/widgets/settings.cpp

@@ -19,6 +19,8 @@
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
+#include "gui/widgets/settings.hpp"
+
 #include "asserts.hpp"
 #include "config_cache.hpp"
 #include "filesystem.hpp"

src/gui/widgets/settings.hpp

@@ -20,18 +20,11 @@
 #ifndef GUI_WIDGETS_SETTING_HPP_INCLUDED
 #define GUI_WIDGETS_SETTING_HPP_INCLUDED
 
-#include "gui/auxiliary/formula.hpp"
-#include "gui/auxiliary/widget_definition.hpp"
 #include "gui/auxiliary/widget_definition/window.hpp"
-#include "gui/auxiliary/window_builder.hpp"
-#include "tstring.hpp"
 
-#include <map>
 #include <string>
 #include <vector>
 
-class config;
-
 namespace gui2 {
 
 /** Do we wish to use the new library or not. */

src/gui/widgets/slider.cpp

@@ -20,6 +20,7 @@
 #include "formatter.hpp"
 #include "gui/auxiliary/log.hpp"
 #include "gui/auxiliary/widget_definition/slider.hpp"
+#include "gui/widgets/settings.hpp"
 #include "sound.hpp"
 
 #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__

src/gui/widgets/text.cpp

@@ -18,6 +18,7 @@
 
 #include "clipboard.hpp"
 #include "gui/auxiliary/log.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <boost/bind.hpp>
 

src/gui/widgets/toggle_button.cpp

@@ -18,6 +18,7 @@
 
 #include "foreach.hpp"
 #include "gui/auxiliary/log.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "sound.hpp"
 

src/gui/widgets/toggle_panel.cpp

@@ -19,6 +19,7 @@
 #include "foreach.hpp"
 #include "gui/auxiliary/log.hpp"
 #include "gui/auxiliary/widget_definition/toggle_panel.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "sound.hpp"
 

src/gui/widgets/window.cpp

@@ -30,6 +30,7 @@
 #include "gui/auxiliary/log.hpp"
 #include "gui/auxiliary/layout_exception.hpp"
 #include "gui/widgets/button.hpp"
+#include "gui/widgets/settings.hpp"
 #ifdef DEBUG_WINDOW_LAYOUT_GRAPHS
 #include "gui/widgets/debug.hpp"
 #endif

src/gui/widgets/window.hpp

@@ -25,7 +25,6 @@
 #include "gui/auxiliary/formula.hpp"
 #include "gui/widgets/helper.hpp"
 #include "gui/widgets/panel.hpp"
-#include "gui/widgets/settings.hpp"
 #include "gui/widgets/tooltip.hpp"
 
 #include "events.hpp"

src/menu_events.cpp

@@ -32,6 +32,7 @@
 #include "gui/dialogs/transient_message.hpp"
 #include "gui/dialogs/gamestate_inspector.hpp"
 #include "gui/dialogs/unit_create.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "help.hpp"
 #include "log.hpp"

src/savegame.cpp

@@ -24,6 +24,7 @@
 #include "gui/dialogs/game_load.hpp"
 #include "gui/dialogs/game_save.hpp"
 #include "gui/dialogs/message.hpp"
+#include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "log.hpp"
 #include "map.hpp"