diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp index e56171412..e80e3de68 100644 --- a/src/input/input_manager.cpp +++ b/src/input/input_manager.cpp @@ -45,7 +45,7 @@ #include "states_screens/dialogs/splitscreen_player_dialog.hpp" #include "states_screens/kart_selection.hpp" #include "states_screens/main_menu_screen.hpp" -#include "states_screens/options_screen_device.hpp" +#include "states_screens/options/options_screen_device.hpp" #include "states_screens/state_manager.hpp" #include "utils/debug.hpp" #include "utils/string_utils.hpp" diff --git a/src/main.cpp b/src/main.cpp index c6c41b9d5..7a2b5a0fa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -237,7 +237,7 @@ #include "states_screens/networking_lobby.hpp" #include "states_screens/register_screen.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/user_screen.hpp" +#include "states_screens/options/user_screen.hpp" #include "states_screens/dialogs/init_android_dialog.hpp" #include "states_screens/dialogs/message_dialog.hpp" #include "tracks/arena_graph.hpp" diff --git a/src/online/online_player_profile.cpp b/src/online/online_player_profile.cpp index 2b92801c1..8177f25e7 100644 --- a/src/online/online_player_profile.cpp +++ b/src/online/online_player_profile.cpp @@ -28,7 +28,7 @@ #include "online/profile_manager.hpp" #include "states_screens/main_menu_screen.hpp" #include "states_screens/online_profile_friends.hpp" -#include "states_screens/user_screen.hpp" +#include "states_screens/options/user_screen.hpp" #include "states_screens/dialogs/change_password_dialog.hpp" #include "states_screens/dialogs/user_info_dialog.hpp" #include "utils/log.hpp" diff --git a/src/states_screens/dialogs/add_device_dialog.cpp b/src/states_screens/dialogs/add_device_dialog.cpp index 958455601..ef3467e55 100644 --- a/src/states_screens/dialogs/add_device_dialog.cpp +++ b/src/states_screens/dialogs/add_device_dialog.cpp @@ -24,7 +24,7 @@ #include "input/device_manager.hpp" #include "input/input_manager.hpp" #include "states_screens/dialogs/message_dialog.hpp" -#include "states_screens/options_screen_input.hpp" +#include "states_screens/options/options_screen_input.hpp" #include "states_screens/state_manager.hpp" #include "utils/cpp2011.hpp" #include "utils/string_utils.hpp" diff --git a/src/states_screens/dialogs/custom_video_settings.cpp b/src/states_screens/dialogs/custom_video_settings.cpp index d7ef9af8f..7ab97b4ba 100644 --- a/src/states_screens/dialogs/custom_video_settings.cpp +++ b/src/states_screens/dialogs/custom_video_settings.cpp @@ -20,7 +20,7 @@ #include "config/user_config.hpp" #include "guiengine/widgets/check_box_widget.hpp" #include "guiengine/widgets/spinner_widget.hpp" -#include "states_screens/options_screen_video.hpp" +#include "states_screens/options/options_screen_video.hpp" #include "utils/translation.hpp" #include "graphics/central_settings.hpp" #include "graphics/irr_driver.hpp" diff --git a/src/states_screens/dialogs/press_a_key_dialog.cpp b/src/states_screens/dialogs/press_a_key_dialog.cpp index f5e3abfd9..abee90300 100644 --- a/src/states_screens/dialogs/press_a_key_dialog.cpp +++ b/src/states_screens/dialogs/press_a_key_dialog.cpp @@ -20,7 +20,7 @@ #include "input/input.hpp" #include "input/input_manager.hpp" #include "states_screens/dialogs/press_a_key_dialog.hpp" -#include "states_screens/options_screen_device.hpp" +#include "states_screens/options/options_screen_device.hpp" #include "utils/translation.hpp" using namespace GUIEngine; diff --git a/src/states_screens/dialogs/race_paused_dialog.cpp b/src/states_screens/dialogs/race_paused_dialog.cpp index df05bf9b0..3086f4b93 100644 --- a/src/states_screens/dialogs/race_paused_dialog.cpp +++ b/src/states_screens/dialogs/race_paused_dialog.cpp @@ -35,7 +35,7 @@ #include "states_screens/main_menu_screen.hpp" #include "states_screens/race_gui_base.hpp" #include "states_screens/race_setup_screen.hpp" -#include "states_screens/options_screen_video.hpp" +#include "states_screens/options/options_screen_video.hpp" #include "states_screens/state_manager.hpp" #include "utils/translation.hpp" diff --git a/src/states_screens/main_menu_screen.cpp b/src/states_screens/main_menu_screen.cpp index 3fcf05b04..afddc90b1 100644 --- a/src/states_screens/main_menu_screen.cpp +++ b/src/states_screens/main_menu_screen.cpp @@ -47,9 +47,9 @@ #include "states_screens/online_profile_achievements.hpp" #include "states_screens/online_profile_servers.hpp" #include "states_screens/online_screen.hpp" -#include "states_screens/options_screen_video.hpp" +#include "states_screens/options/options_screen_video.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/user_screen.hpp" +#include "states_screens/options/user_screen.hpp" #if DEBUG_MENU_ITEM #include "states_screens/feature_unlocked.hpp" #include "states_screens/grand_prix_lose.hpp" diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp index 8cba5d960..26abb2427 100644 --- a/src/states_screens/online_screen.cpp +++ b/src/states_screens/online_screen.cpp @@ -41,7 +41,7 @@ #include "states_screens/online_profile_servers.hpp" #include "states_screens/online_screen.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/user_screen.hpp" +#include "states_screens/options/user_screen.hpp" #include "states_screens/dialogs/general_text_field_dialog.hpp" #include "states_screens/dialogs/message_dialog.hpp" #include "utils/string_utils.hpp" diff --git a/src/states_screens/options_screen_audio.cpp b/src/states_screens/options/options_screen_audio.cpp similarity index 94% rename from src/states_screens/options_screen_audio.cpp rename to src/states_screens/options/options_screen_audio.cpp index 87eae9749..3ec86d73e 100644 --- a/src/states_screens/options_screen_audio.cpp +++ b/src/states_screens/options/options_screen_audio.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/options_screen_audio.hpp" +#include "states_screens/options/options_screen_audio.hpp" #include "audio/music_manager.hpp" #include "audio/sfx_manager.hpp" @@ -27,12 +27,12 @@ #include "guiengine/widgets/spinner_widget.hpp" #include "guiengine/widget.hpp" #include "io/file_manager.hpp" -#include "states_screens/options_screen_input.hpp" -#include "states_screens/options_screen_language.hpp" -#include "states_screens/options_screen_ui.hpp" -#include "states_screens/options_screen_video.hpp" +#include "states_screens/options/options_screen_input.hpp" +#include "states_screens/options/options_screen_language.hpp" +#include "states_screens/options/options_screen_ui.hpp" +#include "states_screens/options/options_screen_video.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/user_screen.hpp" +#include "states_screens/options/user_screen.hpp" #include "utils/translation.hpp" #include diff --git a/src/states_screens/options_screen_audio.hpp b/src/states_screens/options/options_screen_audio.hpp similarity index 100% rename from src/states_screens/options_screen_audio.hpp rename to src/states_screens/options/options_screen_audio.hpp diff --git a/src/states_screens/options_screen_device.cpp b/src/states_screens/options/options_screen_device.cpp similarity index 98% rename from src/states_screens/options_screen_device.cpp rename to src/states_screens/options/options_screen_device.cpp index 862a20b6f..5e01da7f9 100644 --- a/src/states_screens/options_screen_device.cpp +++ b/src/states_screens/options/options_screen_device.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/options_screen_device.hpp" +#include "states_screens/options/options_screen_device.hpp" #include "config/user_config.hpp" #include "guiengine/CGUISpriteBank.hpp" @@ -31,13 +31,13 @@ #include "input/gamepad_device.hpp" #include "io/file_manager.hpp" #include "states_screens/dialogs/press_a_key_dialog.hpp" -#include "states_screens/options_screen_audio.hpp" -#include "states_screens/options_screen_input.hpp" -#include "states_screens/options_screen_language.hpp" -#include "states_screens/options_screen_video.hpp" -#include "states_screens/options_screen_ui.hpp" +#include "states_screens/options/options_screen_audio.hpp" +#include "states_screens/options/options_screen_input.hpp" +#include "states_screens/options/options_screen_language.hpp" +#include "states_screens/options/options_screen_video.hpp" +#include "states_screens/options/options_screen_ui.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/user_screen.hpp" +#include "states_screens/options/user_screen.hpp" #include "utils/translation.hpp" #include diff --git a/src/states_screens/options_screen_device.hpp b/src/states_screens/options/options_screen_device.hpp similarity index 100% rename from src/states_screens/options_screen_device.hpp rename to src/states_screens/options/options_screen_device.hpp diff --git a/src/states_screens/options_screen_input.cpp b/src/states_screens/options/options_screen_input.cpp similarity index 97% rename from src/states_screens/options_screen_input.cpp rename to src/states_screens/options/options_screen_input.cpp index 8b1d4514e..23f4d8a72 100644 --- a/src/states_screens/options_screen_input.cpp +++ b/src/states_screens/options/options_screen_input.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/options_screen_input.hpp" +#include "states_screens/options/options_screen_input.hpp" #include "graphics/irr_driver.hpp" #include "guiengine/CGUISpriteBank.hpp" @@ -28,15 +28,15 @@ #include "input/gamepad_device.hpp" #include "input/input_manager.hpp" #include "io/file_manager.hpp" -#include "states_screens/options_screen_device.hpp" -#include "states_screens/options_screen_audio.hpp" -#include "states_screens/options_screen_language.hpp" -#include "states_screens/options_screen_video.hpp" -#include "states_screens/options_screen_ui.hpp" +#include "states_screens/options/options_screen_device.hpp" +#include "states_screens/options/options_screen_audio.hpp" +#include "states_screens/options/options_screen_language.hpp" +#include "states_screens/options/options_screen_video.hpp" +#include "states_screens/options/options_screen_ui.hpp" #include "states_screens/dialogs/add_device_dialog.hpp" #include "states_screens/dialogs/multitouch_settings_dialog.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/user_screen.hpp" +#include "states_screens/options/user_screen.hpp" #include "utils/string_utils.hpp" #include "utils/translation.hpp" diff --git a/src/states_screens/options_screen_input.hpp b/src/states_screens/options/options_screen_input.hpp similarity index 100% rename from src/states_screens/options_screen_input.hpp rename to src/states_screens/options/options_screen_input.hpp diff --git a/src/states_screens/options_screen_language.cpp b/src/states_screens/options/options_screen_language.cpp similarity index 95% rename from src/states_screens/options_screen_language.cpp rename to src/states_screens/options/options_screen_language.cpp index b7abe776f..ca4ebe0cf 100644 --- a/src/states_screens/options_screen_language.cpp +++ b/src/states_screens/options/options_screen_language.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/options_screen_language.hpp" +#include "states_screens/options/options_screen_language.hpp" #include "addons/news_manager.hpp" #include "audio/sfx_manager.hpp" @@ -39,12 +39,12 @@ #include "io/file_manager.hpp" #include "online/request_manager.hpp" #include "states_screens/main_menu_screen.hpp" -#include "states_screens/options_screen_audio.hpp" -#include "states_screens/options_screen_input.hpp" -#include "states_screens/options_screen_ui.hpp" -#include "states_screens/options_screen_video.hpp" +#include "states_screens/options/options_screen_audio.hpp" +#include "states_screens/options/options_screen_input.hpp" +#include "states_screens/options/options_screen_ui.hpp" +#include "states_screens/options/options_screen_video.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/user_screen.hpp" +#include "states_screens/options/user_screen.hpp" #include "utils/log.hpp" #include "utils/string_utils.hpp" #include "utils/translation.hpp" diff --git a/src/states_screens/options_screen_language.hpp b/src/states_screens/options/options_screen_language.hpp similarity index 100% rename from src/states_screens/options_screen_language.hpp rename to src/states_screens/options/options_screen_language.hpp diff --git a/src/states_screens/options_screen_ui.cpp b/src/states_screens/options/options_screen_ui.cpp similarity index 97% rename from src/states_screens/options_screen_ui.cpp rename to src/states_screens/options/options_screen_ui.cpp index fa3727de2..8187909e8 100644 --- a/src/states_screens/options_screen_ui.cpp +++ b/src/states_screens/options/options_screen_ui.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/options_screen_ui.hpp" +#include "states_screens/options/options_screen_ui.hpp" #include "addons/news_manager.hpp" #include "audio/sfx_manager.hpp" @@ -39,12 +39,12 @@ #include "io/file_manager.hpp" #include "online/request_manager.hpp" #include "states_screens/main_menu_screen.hpp" -#include "states_screens/options_screen_audio.hpp" -#include "states_screens/options_screen_input.hpp" -#include "states_screens/options_screen_language.hpp" -#include "states_screens/options_screen_video.hpp" +#include "states_screens/options/options_screen_audio.hpp" +#include "states_screens/options/options_screen_input.hpp" +#include "states_screens/options/options_screen_language.hpp" +#include "states_screens/options/options_screen_video.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/user_screen.hpp" +#include "states_screens/options/user_screen.hpp" #include "utils/log.hpp" #include "utils/string_utils.hpp" #include "utils/translation.hpp" diff --git a/src/states_screens/options_screen_ui.hpp b/src/states_screens/options/options_screen_ui.hpp similarity index 100% rename from src/states_screens/options_screen_ui.hpp rename to src/states_screens/options/options_screen_ui.hpp diff --git a/src/states_screens/options_screen_video.cpp b/src/states_screens/options/options_screen_video.cpp similarity index 98% rename from src/states_screens/options_screen_video.cpp rename to src/states_screens/options/options_screen_video.cpp index b9dbae529..e85037715 100644 --- a/src/states_screens/options_screen_video.cpp +++ b/src/states_screens/options/options_screen_video.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/options_screen_video.hpp" +#include "states_screens/options/options_screen_video.hpp" #include "audio/sfx_manager.hpp" #include "audio/sfx_base.hpp" @@ -30,12 +30,12 @@ #include "guiengine/widget.hpp" #include "io/file_manager.hpp" #include "states_screens/dialogs/custom_video_settings.hpp" -#include "states_screens/options_screen_audio.hpp" -#include "states_screens/options_screen_input.hpp" -#include "states_screens/options_screen_language.hpp" -#include "states_screens/options_screen_ui.hpp" +#include "states_screens/options/options_screen_audio.hpp" +#include "states_screens/options/options_screen_input.hpp" +#include "states_screens/options/options_screen_language.hpp" +#include "states_screens/options/options_screen_ui.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/user_screen.hpp" +#include "states_screens/options/user_screen.hpp" #include "utils/string_utils.hpp" #include "utils/translation.hpp" diff --git a/src/states_screens/options_screen_video.hpp b/src/states_screens/options/options_screen_video.hpp similarity index 100% rename from src/states_screens/options_screen_video.hpp rename to src/states_screens/options/options_screen_video.hpp diff --git a/src/states_screens/user_screen.cpp b/src/states_screens/options/user_screen.cpp similarity index 98% rename from src/states_screens/user_screen.cpp rename to src/states_screens/options/user_screen.cpp index 55c9d30a6..7b3b6e51a 100644 --- a/src/states_screens/user_screen.cpp +++ b/src/states_screens/options/user_screen.cpp @@ -15,7 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "states_screens/user_screen.hpp" +#include "states_screens/options/user_screen.hpp" #include "addons/news_manager.hpp" #include "audio/sfx_manager.hpp" @@ -33,11 +33,11 @@ #include "states_screens/dialogs/kart_color_slider_dialog.hpp" #include "states_screens/dialogs/recovery_dialog.hpp" #include "states_screens/main_menu_screen.hpp" -#include "states_screens/options_screen_audio.hpp" -#include "states_screens/options_screen_input.hpp" -#include "states_screens/options_screen_language.hpp" -#include "states_screens/options_screen_ui.hpp" -#include "states_screens/options_screen_video.hpp" +#include "states_screens/options/options_screen_audio.hpp" +#include "states_screens/options/options_screen_input.hpp" +#include "states_screens/options/options_screen_language.hpp" +#include "states_screens/options/options_screen_ui.hpp" +#include "states_screens/options/options_screen_video.hpp" #include "states_screens/register_screen.hpp" #include "states_screens/state_manager.hpp" diff --git a/src/states_screens/user_screen.hpp b/src/states_screens/options/user_screen.hpp similarity index 100% rename from src/states_screens/user_screen.hpp rename to src/states_screens/options/user_screen.hpp diff --git a/src/states_screens/register_screen.cpp b/src/states_screens/register_screen.cpp index 334bc819b..1b2e75984 100644 --- a/src/states_screens/register_screen.cpp +++ b/src/states_screens/register_screen.cpp @@ -31,7 +31,7 @@ #include "states_screens/dialogs/message_dialog.hpp" #include "states_screens/main_menu_screen.hpp" #include "states_screens/state_manager.hpp" -#include "states_screens/user_screen.hpp" +#include "states_screens/options/user_screen.hpp" #include "utils/log.hpp" #include "utils/translation.hpp"