Move options screns to their own folder to reduce clutter

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"

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"

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"

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"

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"

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;

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"
 

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"

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"

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 <iostream>

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 <iostream>

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"
 

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"

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"

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"
 

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"
 

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"