Move online screns to their own folders to reduce clutter

src/main.cpp

@@ -234,8 +234,8 @@
 #include "replay/replay_play.hpp"
 #include "replay/replay_recorder.hpp"
 #include "states_screens/main_menu_screen.hpp"
-#include "states_screens/networking_lobby.hpp"
-#include "states_screens/register_screen.hpp"
+#include "states_screens/online/networking_lobby.hpp"
+#include "states_screens/online/register_screen.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/options/user_screen.hpp"
 #include "states_screens/dialogs/init_android_dialog.hpp"

src/network/network_config.cpp

@@ -23,10 +23,10 @@
 #include "network/transport_address.hpp"
 #include "online/xml_request.hpp"
 #include "states_screens/main_menu_screen.hpp"
-#include "states_screens/networking_lobby.hpp"
-#include "states_screens/online_lan.hpp"
-#include "states_screens/online_profile_servers.hpp"
-#include "states_screens/online_screen.hpp"
+#include "states_screens/online/networking_lobby.hpp"
+#include "states_screens/online/online_lan.hpp"
+#include "states_screens/online/online_profile_servers.hpp"
+#include "states_screens/online/online_screen.hpp"
 
 NetworkConfig *NetworkConfig::m_network_config = NULL;
 

src/network/protocols/client_lobby.cpp

@@ -42,11 +42,11 @@
 #include "network/server_config.hpp"
 #include "network/stk_host.hpp"
 #include "network/stk_peer.hpp"
-#include "states_screens/networking_lobby.hpp"
-#include "states_screens/network_kart_selection.hpp"
+#include "states_screens/online/networking_lobby.hpp"
+#include "states_screens/online/network_kart_selection.hpp"
 #include "states_screens/race_result_gui.hpp"
 #include "states_screens/state_manager.hpp"
-#include "states_screens/tracks_screen.hpp"
+#include "states_screens/online/tracks_screen.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_manager.hpp"
 #include "utils/log.hpp"

src/network/protocols/connect_to_server.cpp

@@ -30,7 +30,7 @@
 #include "network/stk_host.hpp"
 #include "network/stk_peer.hpp"
 #include "online/xml_request.hpp"
-#include "states_screens/networking_lobby.hpp"
+#include "states_screens/online/networking_lobby.hpp"
 #include "utils/time.hpp"
 #include "utils/log.hpp"
 

src/network/protocols/server_lobby.cpp

@@ -40,7 +40,7 @@
 #include "online/online_profile.hpp"
 #include "online/request_manager.hpp"
 #include "race/race_manager.hpp"
-#include "states_screens/networking_lobby.hpp"
+#include "states_screens/online/networking_lobby.hpp"
 #include "states_screens/race_result_gui.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_manager.hpp"

src/online/online_player_profile.cpp

@@ -27,7 +27,7 @@
 #include "online/online_profile.hpp"
 #include "online/profile_manager.hpp"
 #include "states_screens/main_menu_screen.hpp"
-#include "states_screens/online_profile_friends.hpp"
+#include "states_screens/online/online_profile_friends.hpp"
 #include "states_screens/options/user_screen.hpp"
 #include "states_screens/dialogs/change_password_dialog.hpp"
 #include "states_screens/dialogs/user_info_dialog.hpp"

src/states_screens/dialogs/registration_dialog.cpp

@@ -20,7 +20,7 @@
 #include "guiengine/engine.hpp"
 #include "guiengine/widgets.hpp"
 #include "states_screens/state_manager.hpp"
-#include "states_screens/register_screen.hpp"
+#include "states_screens/online/register_screen.hpp"
 #include "utils/translation.hpp"
 #include "utils/string_utils.hpp"
 

src/states_screens/dialogs/server_info_dialog.cpp

@@ -26,7 +26,7 @@
 #include "network/server.hpp"
 #include "network/server_config.hpp"
 #include "network/stk_host.hpp"
-#include "states_screens/networking_lobby.hpp"
+#include "states_screens/online/networking_lobby.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/string_utils.hpp"
 

src/states_screens/dialogs/splitscreen_player_dialog.cpp

@@ -30,7 +30,7 @@
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets/spinner_widget.hpp"
 #include "network/network_config.hpp"
-#include "states_screens/networking_lobby.hpp"
+#include "states_screens/online/networking_lobby.hpp"
 #include "utils/translation.hpp"
 
 #include <IGUIEnvironment.h>

src/states_screens/dialogs/user_info_dialog.cpp

@@ -21,8 +21,8 @@
 #include "guiengine/dialog_queue.hpp"
 #include "guiengine/engine.hpp"
 #include "online/online_profile.hpp"
-#include "states_screens/online_profile_achievements.hpp"
-#include "states_screens/online_profile_friends.hpp"
+#include "states_screens/online/online_profile_achievements.hpp"
+#include "states_screens/online/online_profile_friends.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 

src/states_screens/ghost_replay_selection.cpp

@@ -24,7 +24,7 @@
 #include "karts/kart_properties_manager.hpp"
 #include "states_screens/dialogs/ghost_replay_info_dialog.hpp"
 #include "states_screens/state_manager.hpp"
-#include "states_screens/tracks_screen.hpp"
+#include "states_screens/online/tracks_screen.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_manager.hpp"
 #include "utils/translation.hpp"

src/states_screens/gp_info_screen.cpp

@@ -35,7 +35,7 @@
 #include "race/grand_prix_data.hpp"
 #include "race/race_manager.hpp"
 #include "states_screens/state_manager.hpp"
-#include "states_screens/tracks_screen.hpp"
+#include "states_screens/online/tracks_screen.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_manager.hpp"
 #include "utils/translation.hpp"

src/states_screens/main_menu_screen.cpp

@@ -44,9 +44,9 @@
 #include "states_screens/grand_prix_editor_screen.hpp"
 #include "states_screens/help_screen_1.hpp"
 #include "states_screens/offline_kart_selection.hpp"
-#include "states_screens/online_profile_achievements.hpp"
-#include "states_screens/online_profile_servers.hpp"
-#include "states_screens/online_screen.hpp"
+#include "states_screens/online/online_profile_achievements.hpp"
+#include "states_screens/online/online_profile_servers.hpp"
+#include "states_screens/online/online_screen.hpp"
 #include "states_screens/options/options_screen_video.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/options/user_screen.hpp"

src/states_screens/online/create_server_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/create_server_screen.hpp"
+#include "states_screens/online/create_server_screen.hpp"
 
 #include "audio/sfx_manager.hpp"
 #include "config/player_manager.hpp"
@@ -25,7 +25,7 @@
 #include "network/server_config.hpp"
 #include "network/stk_host.hpp"
 #include "states_screens/state_manager.hpp"
-#include "states_screens/networking_lobby.hpp"
+#include "states_screens/online/networking_lobby.hpp"
 #include "utils/separate_process.hpp"
 #include "utils/translation.hpp"
 

src/states_screens/online/network_kart_selection.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/network_kart_selection.hpp"
+#include "states_screens/online/network_kart_selection.hpp"
 
 #include "config/user_config.hpp"
 #include "input/device_manager.hpp"
@@ -23,7 +23,7 @@
 #include "network/protocols/lobby_protocol.hpp"
 #include "network/stk_host.hpp"
 #include "states_screens/state_manager.hpp"
-#include "states_screens/tracks_screen.hpp"
+#include "states_screens/online/tracks_screen.hpp"
 
 using namespace GUIEngine;
 

src/states_screens/online/networking_lobby.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/networking_lobby.hpp"
+#include "states_screens/online/networking_lobby.hpp"
 
 #include <cmath>
 #include <algorithm>

src/states_screens/online/online_lan.cpp

@@ -15,14 +15,14 @@
 //  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/online_profile_servers.hpp"
+#include "states_screens/online/online_profile_servers.hpp"
 
 #include "guiengine/screen.hpp"
 #include "network/network_config.hpp"
 #include "states_screens/state_manager.hpp"
-#include "states_screens/create_server_screen.hpp"
-#include "states_screens/online_lan.hpp"
-#include "states_screens/server_selection.hpp"
+#include "states_screens/online/create_server_screen.hpp"
+#include "states_screens/online/online_lan.hpp"
+#include "states_screens/online/server_selection.hpp"
 #include "utils/translation.hpp"
 
 #include <IGUIButton.h>

src/states_screens/online/online_lan.hpp

@@ -24,7 +24,7 @@
 
 #include "guiengine/screen.hpp"
 #include "guiengine/widgets.hpp"
-#include "states_screens/online_profile_base.hpp"
+#include "states_screens/online/online_profile_base.hpp"
 
 namespace GUIEngine { class Widget; }
 

src/states_screens/online/online_profile_achievements.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/online_profile_achievements.hpp"
+#include "states_screens/online/online_profile_achievements.hpp"
 
 #include "achievements/achievement_info.hpp"
 #include "achievements/achievements_manager.hpp"

src/states_screens/online/online_profile_achievements.hpp

@@ -24,7 +24,7 @@
 
 #include "guiengine/screen.hpp"
 #include "guiengine/widgets.hpp"
-#include "states_screens/online_profile_base.hpp"
+#include "states_screens/online/online_profile_base.hpp"
 #include "online/profile_manager.hpp"
 
 

src/states_screens/online/online_profile_base.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/online_profile_base.hpp"
+#include "states_screens/online/online_profile_base.hpp"
 
 #include "config/player_manager.hpp"
 #include "guiengine/engine.hpp"
@@ -25,10 +25,10 @@
 #include "online/online_profile.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
-#include "states_screens/online_profile_friends.hpp"
-#include "states_screens/online_profile_achievements.hpp"
-#include "states_screens/online_profile_servers.hpp"
-#include "states_screens/online_profile_settings.hpp"
+#include "states_screens/online/online_profile_friends.hpp"
+#include "states_screens/online/online_profile_achievements.hpp"
+#include "states_screens/online/online_profile_servers.hpp"
+#include "states_screens/online/online_profile_settings.hpp"
 
 #include <iostream>
 #include <sstream>

src/states_screens/online/online_profile_friends.cpp

@@ -15,14 +15,14 @@
 //  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/online_profile_friends.hpp"
+#include "states_screens/online/online_profile_friends.hpp"
 
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widget.hpp"
 #include "states_screens/dialogs/user_info_dialog.hpp"
-#include "states_screens/online_user_search.hpp"
+#include "states_screens/online/online_user_search.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 

src/states_screens/online/online_profile_friends.hpp

@@ -24,7 +24,7 @@
 
 #include "guiengine/screen.hpp"
 #include "guiengine/widgets.hpp"
-#include "states_screens/online_profile_base.hpp"
+#include "states_screens/online/online_profile_base.hpp"
 #include "online/profile_manager.hpp"
 
 

src/states_screens/online/online_profile_servers.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/online_profile_servers.hpp"
+#include "states_screens/online/online_profile_servers.hpp"
 
 #include "audio/sfx_manager.hpp"
 #include "config/player_manager.hpp"
@@ -27,9 +27,9 @@
 #include "network/server_config.hpp"
 #include "network/servers_manager.hpp"
 #include "states_screens/state_manager.hpp"
-#include "states_screens/create_server_screen.hpp"
-#include "states_screens/networking_lobby.hpp"
-#include "states_screens/server_selection.hpp"
+#include "states_screens/online/create_server_screen.hpp"
+#include "states_screens/online/networking_lobby.hpp"
+#include "states_screens/online/server_selection.hpp"
 #include "utils/translation.hpp"
 
 #include <IGUIButton.h>

src/states_screens/online/online_profile_servers.hpp

@@ -24,7 +24,7 @@
 
 #include "guiengine/screen.hpp"
 #include "guiengine/widgets.hpp"
-#include "states_screens/online_profile_base.hpp"
+#include "states_screens/online/online_profile_base.hpp"
 
 namespace GUIEngine { class Widget; }
 

src/states_screens/online/online_profile_settings.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/online_profile_settings.hpp"
+#include "states_screens/online/online_profile_settings.hpp"
 
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"

src/states_screens/online/online_profile_settings.hpp

@@ -24,7 +24,7 @@
 
 #include "guiengine/screen.hpp"
 #include "guiengine/widgets.hpp"
-#include "states_screens/online_profile_base.hpp"
+#include "states_screens/online/online_profile_base.hpp"
 
 namespace GUIEngine { class Widget; }
 

src/states_screens/online/online_screen.cpp

@@ -35,11 +35,11 @@
 #include "network/stk_host.hpp"
 #include "network/stk_peer.hpp"
 #include "online/request_manager.hpp"
-#include "states_screens/networking_lobby.hpp"
-#include "states_screens/online_lan.hpp"
-#include "states_screens/online_profile_achievements.hpp"
-#include "states_screens/online_profile_servers.hpp"
-#include "states_screens/online_screen.hpp"
+#include "states_screens/online/networking_lobby.hpp"
+#include "states_screens/online/online_lan.hpp"
+#include "states_screens/online/online_profile_achievements.hpp"
+#include "states_screens/online/online_profile_servers.hpp"
+#include "states_screens/online/online_screen.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/options/user_screen.hpp"
 #include "states_screens/dialogs/general_text_field_dialog.hpp"

src/states_screens/online/online_user_search.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/online_user_search.hpp"
+#include "states_screens/online/online_user_search.hpp"
 
 #include "audio/sfx_manager.hpp"
 #include "config/player_manager.hpp"

src/states_screens/online/register_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/register_screen.hpp"
+#include "states_screens/online/register_screen.hpp"
 
 #include "config/player_manager.hpp"
 #include "config/user_config.hpp"

src/states_screens/online/server_selection.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/server_selection.hpp"
+#include "states_screens/online/server_selection.hpp"
 
 #include "audio/sfx_manager.hpp"
 #include "graphics/irr_driver.hpp"

src/states_screens/online/tracks_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/tracks_screen.hpp"
+#include "states_screens/online/tracks_screen.hpp"
 
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"

src/states_screens/options/user_screen.cpp

@@ -38,7 +38,7 @@
 #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/online/register_screen.hpp"
 #include "states_screens/state_manager.hpp"
 
 

src/states_screens/race_result_gui.cpp

@@ -54,7 +54,7 @@
 #include "scriptengine/property_animator.hpp"
 #include "states_screens/feature_unlocked.hpp"
 #include "states_screens/main_menu_screen.hpp"
-#include "states_screens/networking_lobby.hpp"
+#include "states_screens/online/networking_lobby.hpp"
 #include "states_screens/race_setup_screen.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_manager.hpp"

src/states_screens/track_info_screen.cpp

@@ -37,7 +37,7 @@
 #include "race/highscore_manager.hpp"
 #include "race/race_manager.hpp"
 #include "states_screens/state_manager.hpp"
-#include "states_screens/tracks_screen.hpp"
+#include "states_screens/online/tracks_screen.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_manager.hpp"
 #include "utils/string_utils.hpp"