Moved all preferences source files into a single folder

projectfiles/CodeBlocks/wesnoth.cbp

@@ -287,8 +287,6 @@
 		<Unit filename="../../src/editor/editor_display.hpp" />
 		<Unit filename="../../src/editor/editor_main.cpp" />
 		<Unit filename="../../src/editor/editor_main.hpp" />
-		<Unit filename="../../src/editor/editor_preferences.cpp" />
-		<Unit filename="../../src/editor/editor_preferences.hpp" />
 		<Unit filename="../../src/editor/map/context_manager.cpp" />
 		<Unit filename="../../src/editor/map/context_manager.hpp" />
 		<Unit filename="../../src/editor/map/editor_map.cpp" />
@@ -439,8 +437,6 @@
 		<Unit filename="../../src/game_initialization/singleplayer.hpp" />
 		<Unit filename="../../src/game_launcher.cpp" />
 		<Unit filename="../../src/game_launcher.hpp" />
-		<Unit filename="../../src/game_preferences.cpp" />
-		<Unit filename="../../src/game_preferences.hpp" />
 		<Unit filename="../../src/game_state.cpp" />
 		<Unit filename="../../src/game_state.hpp" />
 		<Unit filename="../../src/generators/cave_map_generator.cpp" />
@@ -829,8 +825,6 @@
 		<Unit filename="../../src/language_win32.ii" />
 		<Unit filename="../../src/lexical_cast.hpp" />
 		<Unit filename="../../src/libc_error.hpp" />
-		<Unit filename="../../src/lobby_preferences.cpp" />
-		<Unit filename="../../src/lobby_preferences.hpp" />
 		<Unit filename="../../src/log.cpp" />
 		<Unit filename="../../src/log.hpp" />
 		<Unit filename="../../src/log_windows.cpp" />
@@ -912,10 +906,16 @@
 		<Unit filename="../../src/playturn.hpp" />
 		<Unit filename="../../src/playturn_network_adapter.cpp" />
 		<Unit filename="../../src/playturn_network_adapter.hpp" />
-		<Unit filename="../../src/preferences.cpp" />
-		<Unit filename="../../src/preferences.hpp" />
-		<Unit filename="../../src/preferences_display.cpp" />
-		<Unit filename="../../src/preferences_display.hpp" />
+		<Unit filename="../../src/preferences/display.cpp" />
+		<Unit filename="../../src/preferences/display.hpp" />
+		<Unit filename="../../src/preferences/editor.cpp" />
+		<Unit filename="../../src/preferences/editor.hpp" />
+		<Unit filename="../../src/preferences/game.cpp" />
+		<Unit filename="../../src/preferences/game.hpp" />
+		<Unit filename="../../src/preferences/general.cpp" />
+		<Unit filename="../../src/preferences/general.hpp" />
+		<Unit filename="../../src/preferences/lobby.cpp" />
+		<Unit filename="../../src/preferences/lobby.hpp" />
 		<Unit filename="../../src/quit_confirmation.cpp" />
 		<Unit filename="../../src/quit_confirmation.hpp" />
 		<Unit filename="../../src/random.cpp" />

source_lists/libwesnoth

@@ -29,6 +29,7 @@ hotkey/hotkey_item.cpp
 hotkey/hotkey_manager.cpp
 image.cpp
 image_modifications.cpp
+preferences/general.cpp
 joystick.cpp
 key.cpp
 language.cpp
@@ -36,7 +37,6 @@ map/label.cpp
 minimap.cpp
 pathfind/astarsearch.cpp
 pathutils.cpp
-preferences.cpp
 quit_confirmation.cpp
 reports.cpp
 show_dialog.cpp

source_lists/wesnoth

@@ -86,7 +86,6 @@ editor/action/mouse/mouse_action_village.cpp
 editor/controller/editor_controller.cpp
 editor/editor_display.cpp
 editor/editor_main.cpp
-editor/editor_preferences.cpp
 editor/map/context_manager.cpp
 editor/map/editor_map.cpp
 editor/map/map_context.cpp
@@ -139,7 +138,6 @@ game_initialization/multiplayer.cpp
 game_initialization/playcampaign.cpp
 game_initialization/singleplayer.cpp
 game_launcher.cpp
-game_preferences.cpp
 game_state.cpp
 gui/auxiliary/iterator/iterator.cpp
 gui/auxiliary/iterator/walker_grid.cpp
@@ -302,7 +300,6 @@ help/help_topic_generators.cpp
 hotkey/hotkey_handler.cpp
 hotkey/hotkey_handler_mp.cpp
 hotkey/hotkey_handler_sp.cpp
-lobby_preferences.cpp
 menu_events.cpp
 mouse_events.cpp
 mouse_handler_base.cpp
@@ -320,7 +317,10 @@ playmp_controller.cpp
 playsingle_controller.cpp
 playturn.cpp
 playturn_network_adapter.cpp
-preferences_display.cpp
+preferences/display.cpp
+preferences/editor.cpp
+preferences/game.cpp
+preferences/lobby.cpp
 random.cpp
 random_deterministic.cpp
 random_synced.cpp

src/actions/advancement.cpp

@@ -23,7 +23,7 @@
 #include "ai/lua/aspect_advancements.hpp"
 #include "game_events/manager.hpp"
 #include "game_events/pump.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "game_data.hpp" //resources::gamedata->phase()
 #include "gui/dialogs/unit_advance.hpp"
 #include "gui/widgets/window.hpp" //gui2::window::OK

src/actions/attack.cpp

@@ -28,7 +28,7 @@
 #include "game_config.hpp"
 #include "game_events/manager.hpp"
 #include "game_events/pump.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "game_data.hpp"
 #include "gettext.hpp"
 #include "log.hpp"

src/actions/create.cpp

@@ -30,7 +30,7 @@
 #include "game_events/manager.hpp"
 #include "game_events/pump.hpp"
 #include "game_state.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "game_data.hpp"
 #include "gettext.hpp"
 #include "log.hpp"

src/actions/move.cpp

@@ -25,7 +25,7 @@
 #include "config_assign.hpp"
 #include "game_events/manager.hpp"
 #include "game_events/pump.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "hotkey/hotkey_item.hpp"
 #include "hotkey/hotkey_command.hpp"

src/actions/undo.cpp

@@ -25,7 +25,7 @@
 #include "map/map.hpp"                      // for gamemap
 #include "map/location.hpp"  // for map_location, operator<<, etc
 #include "mouse_handler_base.hpp"       // for command_disabler
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "recall_list_manager.hpp"   // for recall_list_manager
 #include "replay.hpp"                // for recorder, replay
 #include "replay_helper.hpp"         // for replay_helper

src/actions/unit_creator.cpp

@@ -26,7 +26,7 @@
 #include "game_board.hpp"
 #include "game_events/manager.hpp"
 #include "game_events/pump.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "game_data.hpp" // for resources::gamedata conversion variable_set
 #include "gettext.hpp"
 #include "log.hpp"

src/addon/manager.cpp

@@ -17,7 +17,7 @@
 #include "addon/manager_ui.hpp"
 #include "filesystem.hpp"
 #include "formatter.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "gui/dialogs/addon/connect.hpp"
 #include "gui/dialogs/addon/manager.hpp"

src/addon/manager_ui.cpp

@@ -20,7 +20,7 @@
 #include "addon/manager.hpp"
 #include "filesystem.hpp"
 #include "formula/string_utils.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "gui/dialogs/addon/manager.hpp"
 #include "gui/dialogs/addon/uninstall_list.hpp"

src/ai/actions.cpp

@@ -39,7 +39,7 @@
 #include "actions/attack.hpp"
 #include "actions/create.hpp"
 #include "attack_prediction.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "log.hpp"
 #include "map/map.hpp"
 #include "mouse_handler_base.hpp"

src/attack_prediction.cpp

@@ -40,7 +40,7 @@
 
 #include "actions/attack.hpp"
 #include "game_config.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "random.hpp"
 #include "utils/general.hpp"
 #include <array>

src/chat_command_handler.cpp

@@ -15,8 +15,8 @@
 #include "map_command_handler.hpp"
 #include "chat_command_handler.hpp"
 #include "chat_events.hpp"
-#include "game_preferences.hpp"
-#include "preferences_display.hpp"
+#include "preferences/game.hpp"
+#include "preferences/display.hpp"
 #include "video.hpp"
 #include "game_config_manager.hpp"
 

src/chat_events.cpp

@@ -20,8 +20,8 @@
 #include "log.hpp"
 #include "map_command_handler.hpp"
 #include "chat_command_handler.hpp"
-#include "preferences.hpp"
-#include "game_preferences.hpp"
+#include "preferences/general.hpp"
+#include "preferences/game.hpp"
 
 #include <boost/range/algorithm/find_if.hpp>
 

src/controller_base.cpp

@@ -19,7 +19,7 @@
 #include "show_dialog.hpp" //gui::in_dialog
 #include "display.hpp"
 #include "events.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "hotkey/command_executor.hpp"
 #include "hotkey/hotkey_command.hpp"
 #include "log.hpp"

src/countdown_clock.cpp

@@ -15,7 +15,7 @@
 
 #include "team.hpp"
 #include "saved_game.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "sound.hpp"
 
 namespace {

src/cursor.cpp

@@ -19,9 +19,9 @@
 
 #include "cursor.hpp"
 
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "image.hpp"
-#include "preferences_display.hpp"
+#include "preferences/display.hpp"
 #include "sdl/rect.hpp"
 
 #include <iostream>

src/desktop/notifications.cpp

@@ -14,7 +14,7 @@
 
 #include "desktop/notifications.hpp"
 
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 
 #include "video.hpp" //CVideo::get_singleton().window_state()

src/desktop/paths.cpp

@@ -20,7 +20,7 @@
 #include "filesystem.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "serialization/string_utils.hpp"
 #include "serialization/unicode.hpp"
 

src/display.cpp

@@ -23,7 +23,7 @@
 #include "fake_unit_manager.hpp"
 #include "font/standard_colors.hpp"
 #include "font/text.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "halo.hpp"
 #include "hotkey/command_executor.hpp"

src/display_chat_manager.cpp

@@ -18,7 +18,7 @@
 #include "display.hpp"
 #include "floating_label.hpp"
 #include "game_board.hpp" // <-- only needed for is_observer()
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "log.hpp"
 #include "font/marked-up_text.hpp"
 #include "mp_ui_alerts.hpp"

src/editor/controller/editor_controller.cpp

@@ -25,7 +25,7 @@
 
 #include "editor/action/mouse/mouse_action.hpp"
 
-#include "editor/editor_preferences.hpp"
+#include "preferences/editor.hpp"
 
 #include "gui/dialogs/edit_text.hpp"
 #include "gui/dialogs/editor/custom_tod.hpp"
@@ -43,9 +43,9 @@
 #include "desktop/clipboard.hpp"
 #include "floating_label.hpp"
 #include "game_board.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
-#include "preferences_display.hpp"
+#include "preferences/display.hpp"
 #include "sound.hpp"
 #include "units/unit.hpp"
 #include "units/animation_component.hpp"

src/editor/map/context_manager.cpp

@@ -29,7 +29,7 @@
 
 #include "editor/action/action.hpp"
 #include "editor/controller/editor_controller.hpp"
-#include "editor/editor_preferences.hpp"
+#include "preferences/editor.hpp"
 
 #include "gui/dialogs/edit_text.hpp"
 #include "gui/dialogs/editor/generate_map.hpp"

src/editor/map/context_manager.hpp

@@ -16,7 +16,7 @@
 #define CONTEXT_MANAGER_HPP_INCLUDED
 
 #include "editor/map/map_context.hpp"
-#include "editor/editor_preferences.hpp"
+#include "preferences/editor.hpp"
 #include "editor/map/map_fragment.hpp"
 
 class map_generator;

src/editor/map/map_context.cpp

@@ -14,7 +14,7 @@
 #define GETTEXT_DOMAIN "wesnoth-editor"
 
 #include "editor/action/action.hpp"
-#include "editor/editor_preferences.hpp"
+#include "preferences/editor.hpp"
 #include "editor/map/map_context.hpp"
 
 #include "config_assign.hpp"

src/floating_textbox.cpp

@@ -19,7 +19,7 @@
 #include "floating_label.hpp"
 #include "font/standard_colors.hpp"
 #include "game_display.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "log.hpp"
 #include "resources.hpp"
 

src/font/font_config.cpp

@@ -28,7 +28,7 @@
 #include "serialization/preprocessor.hpp"
 #include "serialization/string_utils.hpp"
 #include "serialization/unicode.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 
 #include <list>
 #include <set>

src/font/marked-up_text.cpp

@@ -29,7 +29,7 @@
 #include "serialization/unicode.hpp"
 #include "video.hpp"
 #include "wml_exception.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 
 namespace font {
 

src/font/sdl_ttf.cpp

@@ -24,7 +24,7 @@
 #include "game_config.hpp"
 #include "log.hpp"
 #include "font/marked-up_text.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "tooltips.hpp"
 
 #include "sdl/rect.hpp"

src/font/text.cpp

@@ -31,7 +31,7 @@
 #include "sdl/utils.hpp"
 #include "serialization/string_utils.hpp"
 #include "serialization/unicode.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 
 #include <cassert>
 #include <cstring>

src/format_time_summary.cpp

@@ -16,7 +16,7 @@
 
 #include "assert.h"
 #include "gettext.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 
 namespace utils {
 

src/game_board.cpp

@@ -14,7 +14,7 @@
 
 #include "config.hpp"
 #include "game_board.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "log.hpp"
 #include "map/map.hpp"
 #include "recall_list_manager.hpp"

src/game_config_manager.cpp

@@ -27,7 +27,7 @@
 #include "hotkey/hotkey_command.hpp"
 #include "language.hpp"
 #include "log.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "scripting/game_lua_kernel.hpp"
 #include "terrain/builder.hpp"
 #include "terrain/type_data.hpp"

src/game_display.cpp

@@ -28,7 +28,7 @@
 #include "fake_unit_ptr.hpp"
 #include "floating_label.hpp"
 #include "game_board.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "halo.hpp"
 #include "log.hpp"
 #include "map/map.hpp"

src/game_events/action_wml.cpp

@@ -33,7 +33,7 @@
 #include "filesystem.hpp"
 #include "game_classification.hpp"
 #include "game_display.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "gui/dialogs/transient_message.hpp"
 #include "gui/widgets/window.hpp"

src/game_events/menu_item.cpp

@@ -32,7 +32,7 @@
 #include "hotkey/hotkey_command.hpp"
 #include "hotkey/hotkey_handler.hpp"
 #include "play_controller.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "replay.hpp"
 #include "replay_helper.hpp"
 #include "resources.hpp"

src/game_initialization/configure_engine.hpp

@@ -16,7 +16,7 @@
 #define MULTIPLAYER_CONFIGURE_ENGINE_INCLUDED
 
 #include "gettext.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "mp_game_settings.hpp"
 #include "saved_game.hpp"
 

src/game_initialization/connect_engine.cpp

@@ -18,7 +18,7 @@
 #include "formula/string_utils.hpp"
 #include "game_initialization/mp_game_utils.hpp"
 #include "game_initialization/playcampaign.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
 #include "map/map.hpp"

src/game_initialization/create_engine.cpp

@@ -18,7 +18,7 @@
 #include "filesystem.hpp"
 #include "formula/string_utils.hpp"
 #include "game_config_manager.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "generators/map_create.hpp"
 #include "gui/dialogs/campaign_difficulty.hpp"
 #include "hash.hpp"

src/game_initialization/lobby_data.cpp

@@ -15,7 +15,7 @@
 #include "game_initialization/lobby_data.hpp"
 
 #include "config.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gui/dialogs/campaign_difficulty.hpp"
 #include "filesystem.hpp"
 #include "formatter.hpp"

src/game_initialization/lobby_info.cpp

@@ -15,7 +15,7 @@
 #include "game_initialization/lobby_info.hpp"
 
 #include "config.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "formula/string_utils.hpp"
 #include "gettext.hpp"
 #include "log.hpp"

src/game_initialization/multiplayer.cpp

@@ -20,7 +20,7 @@
 #include "game_config_manager.hpp"
 #include "game_initialization/mp_game_utils.hpp"
 #include "game_initialization/playcampaign.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "gui/dialogs/lobby/lobby.hpp"
 #include "gui/dialogs/message.hpp"

src/game_initialization/playcampaign.cpp

@@ -23,7 +23,7 @@
 #include "carryover.hpp"
 #include "game_config.hpp"
 #include "game_errors.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "generators/map_create.hpp"
 #include "generators/map_generator.hpp"
 #include "gui/dialogs/message.hpp"

src/game_launcher.cpp

@@ -46,8 +46,8 @@
 #include "game_initialization/multiplayer.hpp"              // for start_client, etc
 #include "game_initialization/create_engine.hpp"
 #include "game_initialization/playcampaign.hpp"             // for play_game, etc
-#include "preferences.hpp"              // for disable_preferences_save, etc
-#include "preferences_display.hpp"
+#include "preferences/general.hpp"              // for disable_preferences_save, etc
+#include "preferences/display.hpp"
 #include "savegame.hpp"                 // for clean_saves, etc
 #include "scripting/application_lua_kernel.hpp"
 #include "sdl/surface.hpp"                // for surface

src/game_launcher.hpp

@@ -17,7 +17,7 @@
 #include "editor/editor_main.hpp"       // for EXIT_STATUS
 #include "events.hpp"                   // for event_context
 #include "font/font_config.hpp"         // for manager
-#include "game_preferences.hpp"         // for manager
+#include "preferences/game.hpp"         // for manager
 #include "hotkey/hotkey_manager.hpp"    // for manager
 #include "image.hpp"                    // for manager
 #include "saved_game.hpp"               // for saved_game

src/game_state.cpp

@@ -23,7 +23,7 @@
 #include "pathfind/pathfind.hpp"
 #include "pathfind/teleport.hpp"
 #include "play_controller.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "random_deterministic.hpp"
 #include "reports.hpp"
 #include "scripting/game_lua_kernel.hpp"

src/gui/auxiliary/tips.cpp

@@ -17,7 +17,7 @@
 #include "gui/auxiliary/tips.hpp"
 
 #include "config.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "random.hpp"
 #include "serialization/string_utils.hpp"
 

src/gui/dialogs/addon/manager.cpp

@@ -53,7 +53,7 @@
 #include "formula/string_utils.hpp"
 #include "image.hpp"
 #include "language.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "utils/general.hpp"
 
 #include "config.hpp"

src/gui/dialogs/advanced_graphics_options.hpp

@@ -17,7 +17,7 @@
 
 #include "gui/dialogs/modal_dialog.hpp"
 #include "gui/widgets/group.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 
 namespace gui2
 {

src/gui/dialogs/campaign_difficulty.cpp

@@ -15,7 +15,7 @@
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
 #include "config.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "formula/string_utils.hpp"
 
 #include "gui/dialogs/campaign_difficulty.hpp"

src/gui/dialogs/campaign_selection.cpp

@@ -17,7 +17,7 @@
 #include "gui/dialogs/campaign_selection.hpp"
 
 #include "config_assign.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gui/auxiliary/find_widget.hpp"
 #include "gui/dialogs/helper.hpp"
 #include "gui/widgets/button.hpp"

src/gui/dialogs/chat_log.cpp

@@ -33,7 +33,7 @@
 #include "font/pango/escape.hpp"
 #include "desktop/clipboard.hpp"
 #include "serialization/unicode.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "log.hpp"
 #include "replay.hpp"
 #include "gettext.hpp"

src/gui/dialogs/game_delete.cpp

@@ -14,7 +14,7 @@
 
 #include "gui/dialogs/game_delete.hpp"
 
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gui/widgets/settings.hpp"
 
 namespace gui2

src/gui/dialogs/game_load.cpp

@@ -20,7 +20,7 @@
 #include "formula/string_utils.hpp"
 #include "gettext.hpp"
 #include "game_config.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "game_classification.hpp"
 #include "gui/auxiliary/field.hpp"
 #include "gui/core/log.hpp"

src/gui/dialogs/language_selection.cpp

@@ -25,7 +25,7 @@
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 #include "language.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 
 namespace gui2
 {

src/gui/dialogs/loading_screen.cpp

@@ -30,7 +30,7 @@
 #include "cursor.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "utils/functional.hpp"
 #include <boost/thread.hpp>
 

src/gui/dialogs/lobby/lobby.cpp

@@ -44,9 +44,9 @@
 #include "addon/manager_ui.hpp"
 #include "formatter.hpp"
 #include "formula/string_utils.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
-#include "lobby_preferences.hpp"
+#include "preferences/lobby.hpp"
 #include "playmp_controller.hpp"
 #include "wesnothd_connection.hpp"
 

src/gui/dialogs/lobby/player_info.cpp

@@ -20,7 +20,7 @@
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/text_box.hpp"
 
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 
 #include "utils/functional.hpp"

src/gui/dialogs/multiplayer/mp_alerts_options.cpp

@@ -26,7 +26,7 @@
 #include "gui/widgets/window.hpp"
 
 #include "mp_ui_alerts.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "formula/string_utils.hpp"
 
 #include "utils/functional.hpp"

src/gui/dialogs/multiplayer/mp_change_control.cpp

@@ -22,7 +22,7 @@
 #include "formula/string_utils.hpp"
 #include "game_board.hpp"
 #include "game_display.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gui/auxiliary/find_widget.hpp"
 #include "gui/dialogs/helper.hpp"
 #include "gui/widgets/label.hpp"

src/gui/dialogs/multiplayer/mp_cmd_wrapper.cpp

@@ -22,7 +22,7 @@
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
 
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 
 namespace gui2
 {

src/gui/dialogs/multiplayer/mp_connect.cpp

@@ -16,7 +16,7 @@
 
 #include "gui/dialogs/multiplayer/mp_connect.hpp"
 
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gui/auxiliary/field.hpp"
 #include "gui/dialogs/modal_dialog.hpp"
 #include "gui/widgets/button.hpp"

src/gui/dialogs/multiplayer/mp_create_game.cpp

@@ -18,7 +18,7 @@
 
 #include "config_assign.hpp"
 #include "game_config_manager.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "gui/auxiliary/field.hpp"
 #include "gui/dialogs/helper.hpp"

src/gui/dialogs/multiplayer/mp_host_game_prompt.cpp

@@ -15,7 +15,7 @@
 
 #include "gui/dialogs/multiplayer/mp_host_game_prompt.hpp"
 
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gui/widgets/settings.hpp"
 
 namespace gui2

src/gui/dialogs/multiplayer/mp_join_game.cpp

@@ -21,7 +21,7 @@
 #include "game_config.hpp"
 #include "game_config_manager.hpp"
 #include "game_initialization/mp_game_utils.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "gui/auxiliary/find_widget.hpp"
 #include "gui/dialogs/helper.hpp"

src/gui/dialogs/multiplayer/mp_login.cpp

@@ -16,7 +16,7 @@
 
 #include "gui/dialogs/multiplayer/mp_login.hpp"
 
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gui/auxiliary/find_widget.hpp"
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/password_box.hpp"

src/gui/dialogs/multiplayer/mp_method_selection.cpp

@@ -16,7 +16,7 @@
 
 #include "gui/dialogs/multiplayer/mp_method_selection.hpp"
 
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gui/auxiliary/find_widget.hpp"
 #ifdef GUI2_EXPERIMENTAL_LISTBOX
 #include "gui/widgets/list.hpp"

src/gui/dialogs/multiplayer/mp_options_helper.cpp

@@ -16,7 +16,7 @@
 #include "gui/dialogs/multiplayer/mp_options_helper.hpp"
 
 #include "config_assign.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gui/auxiliary/find_widget.hpp"
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/menu_button.hpp"

src/gui/dialogs/preferences_dialog.cpp

@@ -22,12 +22,12 @@
 #include "filesystem.hpp"
 #include "formatter.hpp"
 #include "formula/string_utils.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "hotkey/hotkey_command.hpp"
 #include "hotkey/hotkey_item.hpp"
-#include "lobby_preferences.hpp"
-#include "preferences.hpp"
-#include "preferences_display.hpp"
+#include "preferences/lobby.hpp"
+#include "preferences/general.hpp"
+#include "preferences/display.hpp"
 #include "video.hpp"
 
 // Sub-dialog includes

src/gui/dialogs/preferences_dialog.hpp

@@ -17,7 +17,7 @@
 #define GUI_DIALOGS_PREFERENCES_DIALOG_HPP_INCLUDED
 
 #include "config.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "utils/make_enum.hpp"
 #include "gui/dialogs/modal_dialog.hpp"
 #include "gui/widgets/group.hpp"

src/gui/dialogs/select_orb_colors.cpp

@@ -24,7 +24,7 @@
 #include "gui/widgets/toggle_button.hpp"
 #include "gui/widgets/window.hpp"
 
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "game_config.hpp"
 
 #include "utils/functional.hpp"

src/gui/dialogs/title_screen.cpp

@@ -21,7 +21,7 @@
 #include "game_config.hpp"
 #include "game_config_manager.hpp"
 #include "game_launcher.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "gui/auxiliary/find_widget.hpp"
 #include "gui/auxiliary/tips.hpp"

src/gui/widgets/chatbox.cpp

@@ -34,8 +34,8 @@
 #include "gettext.hpp"
 #include "wesnothd_connection.hpp"
 #include "config_assign.hpp"
-#include "game_preferences.hpp"
-#include "lobby_preferences.hpp"
+#include "preferences/game.hpp"
+#include "preferences/lobby.hpp"
 #include "log.hpp"
 #include "scripting/plugins/manager.hpp"
 

src/gui/widgets/settings.cpp

@@ -34,7 +34,7 @@
 #include "formula/string_utils.hpp"
 #include "wml_exception.hpp"
 #include "gui/core/log.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 
 namespace gui2
 {

src/gui/widgets/text_box.cpp

@@ -21,7 +21,7 @@
 #include "gui/core/register_widget.hpp"
 #include "gui/widgets/settings.hpp"
 #include "gui/widgets/window.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "serialization/unicode.hpp"
 #include "utils/functional.hpp"
 

src/gui/widgets/unit_preview_pane.cpp

@@ -29,7 +29,7 @@
 #include "font/text_formatting.hpp"
 #include "formatter.hpp"
 #include "formula/string_utils.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "help/help.hpp"
 #include "help/help_impl.hpp"

src/gui/widgets/window.cpp

@@ -52,8 +52,8 @@
 #ifdef DEBUG_WINDOW_LAYOUT_GRAPHS
 #include "gui/widgets/debug.hpp"
 #endif
-#include "preferences.hpp"
-#include "preferences_display.hpp"
+#include "preferences/general.hpp"
+#include "preferences/display.hpp"
 #include "sdl/rect.hpp"
 #include "sdl/surface.hpp"
 #include "tstring.hpp"

src/halo.cpp

@@ -20,7 +20,7 @@
 
 #include "animated.hpp"
 #include "display.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "halo.hpp"
 #include "log.hpp"
 #include "serialization/string_utils.hpp"

src/help/help.cpp

@@ -24,7 +24,7 @@
 #include "config.hpp"                   // for config, etc
 #include "events.hpp"                   // for raise_draw_event, pump, etc
 #include "font/constants.hpp"           // for relative_size
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"                  // for _
 #include "gui/dialogs/transient_message.hpp"
 #include "help/help_browser.hpp"             // for help_browser

src/help/help_impl.cpp

@@ -19,7 +19,7 @@
 #include "display_context.hpp"          // for display_context
 #include "game_config.hpp"              // for debug, menu_contract, etc
 #include "game_config_manager.hpp"      // for game_config_manager
-#include "game_preferences.hpp"         // for encountered_terrains, etc
+#include "preferences/game.hpp"         // for encountered_terrains, etc
 #include "gettext.hpp"                  // for _, gettext, N_
 #include "help/help_topic_generators.hpp"
 #include "hotkey/hotkey_command.hpp"    // for is_scope_active, etc

src/help/help_text_area.cpp

@@ -19,7 +19,7 @@
 #include "help/help_impl.hpp"           // for parse_error, box_width, etc
 #include "image.hpp"                    // for get_image
 #include "log.hpp"                      // for LOG_STREAM, log_domain, etc
-#include "preferences.hpp"              // for font_scaled
+#include "preferences/general.hpp"              // for font_scaled
 #include "sdl/rect.hpp"                 // for draw_rectangle, etc
 #include "serialization/parser.hpp"     // for read, write
 #include "video.hpp"                    // for CVideo

src/help/help_topic_generators.cpp

@@ -16,7 +16,7 @@
 
 #include "font/sdl_ttf.hpp"             // for line_width
 #include "game_config.hpp"              // for debug, menu_contract, etc
-#include "game_preferences.hpp"         // for encountered_terrains, etc
+#include "preferences/game.hpp"         // for encountered_terrains, etc
 #include "gettext.hpp"                  // for _, gettext, N_
 #include "language.hpp"                 // for string_table, symbol_table
 #include "log.hpp"                      // for LOG_STREAM, logger, etc

src/hotkey/command_executor.cpp

@@ -25,7 +25,7 @@
 #include "construct_dialog.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "game_end_exceptions.hpp"
 #include "display.hpp"
 #include "quit_confirmation.hpp"

src/hotkey/hotkey_command.cpp

@@ -18,7 +18,7 @@
 #include "hotkey/hotkey_command.hpp"
 #include "hotkey/hotkey_item.hpp"
 #include "config.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "log.hpp"
 
 static lg::log_domain log_config("config");

src/hotkey/hotkey_handler.cpp

@@ -23,13 +23,13 @@
 #include "game_errors.hpp"
 #include "game_events/menu_item.hpp"
 #include "game_events/wmi_container.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "game_state.hpp"
 #include "hotkey/hotkey_command.hpp"
 #include "hotkey/hotkey_item.hpp"
 #include "map/map.hpp"
 #include "play_controller.hpp"
-#include "preferences_display.hpp"
+#include "preferences/display.hpp"
 #include "savegame.hpp"
 #include "saved_game.hpp"
 #include "whiteboard/manager.hpp"

src/image.cpp

@@ -27,7 +27,7 @@
 #include "image_modifications.hpp"
 #include "log.hpp"
 #include "gettext.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "sdl/rect.hpp"
 #include "utils/general.hpp"
 

src/joystick.cpp

@@ -13,7 +13,7 @@
 */
 
 #include "joystick.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "log.hpp"
 #include "sdl/surface.hpp"
 #include "utils/math.hpp"

src/language.cpp

@@ -16,7 +16,7 @@
 #include "gettext.hpp"
 #include "language.hpp"
 #include "log.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "serialization/parser.hpp"
 #include "serialization/preprocessor.hpp"
 

src/menu_events.cpp

@@ -40,7 +40,7 @@
 #include "game_end_exceptions.hpp"
 #include "game_events/manager.hpp"
 #include "game_events/pump.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "game_state.hpp"
 #include "gettext.hpp"
 #include "gui/dialogs/chat_log.hpp"
@@ -71,7 +71,7 @@
 #include "mouse_events.hpp"
 #include "play_controller.hpp"
 #include "playsingle_controller.hpp"
-#include "preferences_display.hpp"
+#include "preferences/display.hpp"
 #include "replay.hpp"
 #include "replay_helper.hpp"
 #include "resources.hpp"

src/minimap.cpp

@@ -31,7 +31,7 @@
 
 #include "game_display.hpp"
 
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 
 static lg::log_domain log_display("display");
 #define DBG_DP LOG_STREAM(debug, log_display)

src/mouse_handler_base.cpp

@@ -18,7 +18,7 @@
 #include "cursor.hpp"
 #include "display.hpp"
 #include "log.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "tooltips.hpp"
 #include "sdl/rect.hpp"
 

src/mp_ui_alerts.cpp

@@ -23,7 +23,7 @@
 #include "formula/string_utils.hpp"
 #include "game_config.hpp"
 #include "gettext.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "sound.hpp"
 
 #include <string>

src/play_controller.cpp

@@ -31,7 +31,7 @@
 #include "game_events/manager.hpp"
 #include "game_events/menu_item.hpp"
 #include "game_events/pump.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "game_state.hpp"
 #include "hotkey/hotkey_item.hpp"
 #include "hotkey/hotkey_handler.hpp"
@@ -42,7 +42,7 @@
 #include "hotkey/command_executor.hpp"
 #include "log.hpp"
 #include "pathfind/teleport.hpp"
-#include "preferences_display.hpp"
+#include "preferences/display.hpp"
 #include "replay.hpp"
 #include "reports.hpp"
 #include "resources.hpp"

src/playmp_controller.cpp

@@ -24,7 +24,7 @@
 #include "log.hpp"
 #include "mp_ui_alerts.hpp"
 #include "playturn.hpp"
-#include "preferences.hpp"
+#include "preferences/general.hpp"
 #include "game_initialization/playcampaign.hpp"
 #include "resources.hpp"
 #include "savegame.hpp"

src/playsingle_controller.cpp

@@ -29,7 +29,7 @@
 #include "game_end_exceptions.hpp"
 #include "game_events/manager.hpp"
 #include "game_events/pump.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "gui/dialogs/story_viewer.hpp"
 #include "gui/dialogs/transient_message.hpp"

src/playturn.cpp

@@ -29,7 +29,7 @@
 #include "map/label.hpp"
 #include "play_controller.hpp"          // for play_controller
 #include "playturn_network_adapter.hpp"  // for playturn_network_adapter
-#include "preferences.hpp"              // for message_bell
+#include "preferences/general.hpp"              // for message_bell
 #include "replay.hpp"                   // for replay, recorder, do_replay, etc
 #include "resources.hpp"                // for gameboard, screen, etc
 #include "serialization/string_utils.hpp"  // for string_map

src/preferences/display.cpp

@@ -19,13 +19,13 @@
  *  Manage display-related preferences, e.g. screen-size, etc.
  */
 
-#include "preferences_display.hpp"
+#include "preferences/display.hpp"
 
 #include "display.hpp"
 #include "filesystem.hpp"
 #include "formatter.hpp"
 #include "formula/string_utils.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "gettext.hpp"
 #include "gui/dialogs/file_dialog.hpp"
 #include "gui/dialogs/message.hpp"

src/preferences/editor.cpp

@@ -12,9 +12,9 @@
    See the COPYING file for more details.
 */
 
-#include "editor/editor_preferences.hpp"
+#include "preferences/editor.hpp"
 #include "config.hpp"
-#include "game_preferences.hpp"
+#include "preferences/game.hpp"
 #include "lexical_cast.hpp"
 #include "serialization/string_utils.hpp"