Remove unneeded header file includes in online screens

src/online/online_player_profile.cpp

@@ -23,6 +23,7 @@
 #include "config/user_config.hpp"
 #include "guiengine/message_queue.hpp"
 #include "guiengine/screen.hpp"
+#include "io/xml_node.hpp"
 #include "network/network_config.hpp"
 #include "online/online_profile.hpp"
 #include "online/profile_manager.hpp"

src/states_screens/dialogs/user_info_dialog.cpp

@@ -20,7 +20,12 @@
 #include "config/player_manager.hpp"
 #include "guiengine/dialog_queue.hpp"
 #include "guiengine/engine.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "io/xml_node.hpp"
 #include "online/online_profile.hpp"
+#include "online/profile_manager.hpp"
 #include "online/xml_request.hpp"
 #include "states_screens/online/online_profile_achievements.hpp"
 #include "states_screens/online/online_profile_friends.hpp"

src/states_screens/dialogs/user_info_dialog.hpp

@@ -20,11 +20,11 @@
 #define HEADER_USER_INFO_DIALOG_HPP
 
 #include "guiengine/modaldialog.hpp"
-#include "guiengine/widgets.hpp"
 #include "utils/types.hpp"
 
 #include <irrString.h>
 
+namespace GUIEngine { class IconButtonWidget; class LabelWidget; class RibbonWidget; }
 namespace Online
 {
     class OnlineProfile;

src/states_screens/online/create_server_screen.cpp

@@ -20,6 +20,11 @@
 #include "audio/sfx_manager.hpp"
 #include "config/player_manager.hpp"
 #include "config/user_config.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "guiengine/widgets/spinner_widget.hpp"
+#include "guiengine/widgets/text_box_widget.hpp"
 #include "karts/controller/network_ai_controller.hpp"
 #include "network/network_config.hpp"
 #include "network/server.hpp"

src/states_screens/online/create_server_screen.hpp

@@ -19,10 +19,12 @@
 #define HEADER_CREATE_SERVER_SCREEN_HPP
 
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets.hpp"
 
-
-namespace GUIEngine { class Widget; class ListWidget; }
+namespace GUIEngine
+{
+    class IconButtonWidget; class LabelWidget; class RibbonWidget;
+    class SpinnerWidget; class TextBoxWidget; class Widget;
+}
 
 /**
   * \brief Handles the main menu

src/states_screens/online/online_lan.cpp

@@ -18,6 +18,7 @@
 #include "states_screens/online/online_profile_servers.hpp"
 
 #include "guiengine/screen.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "network/network_config.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/online/create_server_screen.hpp"

src/states_screens/online/online_lan.hpp

@@ -23,8 +23,6 @@
 #include <irrString.h>
 
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets.hpp"
-#include "states_screens/online/online_profile_base.hpp"
 
 namespace GUIEngine { class Widget; }
 

src/states_screens/online/online_profile_achievements.cpp

@@ -24,6 +24,8 @@
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "online/online_profile.hpp"
 #include "states_screens/dialogs/achievement_progress_dialog.hpp"
 #include "states_screens/dialogs/player_rankings_dialog.hpp"

src/states_screens/online/online_profile_achievements.hpp

@@ -24,9 +24,8 @@
 
 #include "achievements/achievement.hpp"
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets.hpp"
+#include "guiengine/widgets/list_widget.hpp"
 #include "states_screens/online/online_profile_base.hpp"
-#include "online/profile_manager.hpp"
 
 
 namespace GUIEngine { class Widget; }

src/states_screens/online/online_profile_base.cpp

@@ -22,7 +22,11 @@
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "online/online_profile.hpp"
+#include "online/profile_manager.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 #include "states_screens/online/online_profile_friends.hpp"

src/states_screens/online/online_profile_base.hpp

@@ -23,10 +23,9 @@
 #include <irrString.h>
 
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets.hpp"
-#include "online/profile_manager.hpp"
 
-namespace GUIEngine { class Widget; }
+namespace GUIEngine { class IconButtonWidget; class LabelWidget; class RibbonWidget; class Widget; }
+namespace Online { class OnlineProfile; }
 
 
 /** Online profile base screen. Used for displaying friends, achievements,

src/states_screens/online/online_profile_friends.cpp

@@ -21,6 +21,11 @@
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widget.hpp"
+#include "guiengine/widgets/button_widget.hpp"
+#include "guiengine/widgets/list_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "guiengine/widgets/text_box_widget.hpp"
+#include "online/profile_manager.hpp"
 #include "states_screens/dialogs/user_info_dialog.hpp"
 #include "states_screens/online/online_user_search.hpp"
 #include "states_screens/state_manager.hpp"

src/states_screens/online/online_profile_friends.hpp

@@ -23,12 +23,11 @@
 #include <irrString.h>
 
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets.hpp"
+#include "guiengine/widgets/list_widget.hpp"
 #include "states_screens/online/online_profile_base.hpp"
-#include "online/profile_manager.hpp"
 
 
-namespace GUIEngine { class Widget; }
+namespace GUIEngine { class ButtonWidget; class ListWidget; class TextBoxWidget; class Widget; }
 
 
 /** Online profile overview screen.

src/states_screens/online/online_profile_servers.cpp

@@ -22,6 +22,7 @@
 #include "guiengine/engine.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "network/network_config.hpp"
 #include "network/stk_host.hpp"
 #include "network/server_config.hpp"
@@ -54,15 +55,15 @@ void OnlineProfileServers::init()
     if (!PlayerManager::getCurrentOnlineId())
     {
         getWidget("back")->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
-        getWidget<IconButtonWidget>("find_wan_server")->setActive(false);
-        getWidget<IconButtonWidget>("create_wan_server")->setActive(false);
-        getWidget<IconButtonWidget>("quick_wan_play")->setActive(false);
+        getWidget("find_wan_server")->setActive(false);
+        getWidget("create_wan_server")->setActive(false);
+        getWidget("quick_wan_play")->setActive(false);
     }
     else
     {
-        getWidget<IconButtonWidget>("find_wan_server")->setActive(true);
-        getWidget<IconButtonWidget>("create_wan_server")->setActive(true);
-        getWidget<IconButtonWidget>("quick_wan_play")->setActive(true);
+        getWidget("find_wan_server")->setActive(true);
+        getWidget("create_wan_server")->setActive(true);
+        getWidget("quick_wan_play")->setActive(true);
         RibbonWidget* ribbon = getWidget<RibbonWidget>("wan");
         assert(ribbon != NULL);
         ribbon->select("find_wan_server", PLAYER_ID_GAME_MASTER);

src/states_screens/online/online_profile_servers.hpp

@@ -23,7 +23,6 @@
 #include <irrString.h>
 
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets.hpp"
 #include "states_screens/online/online_profile_base.hpp"
 
 namespace GUIEngine { class Widget; }

src/states_screens/online/online_profile_settings.cpp

@@ -21,6 +21,10 @@
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widget.hpp"
+#include "guiengine/widgets/button_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "guiengine/widgets/text_box_widget.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/dialogs/change_password_dialog.hpp"
 #include "states_screens/dialogs/general_text_field_dialog.hpp"

src/states_screens/online/online_profile_settings.hpp

@@ -23,10 +23,9 @@
 #include <irrString.h>
 
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets.hpp"
 #include "states_screens/online/online_profile_base.hpp"
 
-namespace GUIEngine { class Widget; }
+namespace GUIEngine { class ButtonWidget; class Widget; }
 
 
 /**

src/states_screens/online/online_screen.cpp

@@ -21,6 +21,7 @@
 #include "config/player_manager.hpp"
 #include "config/user_config.hpp"
 #include "guiengine/message_queue.hpp"
+#include "guiengine/widgets/button_widget.hpp"
 #include "guiengine/widgets/check_box_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
 #include "guiengine/widgets/list_widget.hpp"
@@ -34,6 +35,7 @@
 #include "network/socket_address.hpp"
 #include "network/stk_host.hpp"
 #include "network/stk_peer.hpp"
+#include "online/profile_manager.hpp"
 #include "online/request_manager.hpp"
 #include "states_screens/online/networking_lobby.hpp"
 #include "states_screens/online/online_lan.hpp"

src/states_screens/online/online_user_search.cpp

@@ -20,6 +20,11 @@
 #include "audio/sfx_manager.hpp"
 #include "config/player_manager.hpp"
 #include "guiengine/modaldialog.hpp"
+#include "guiengine/widgets/button_widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/list_widget.hpp"
+#include "guiengine/widgets/text_box_widget.hpp"
+#include "io/xml_node.hpp"
 #include "online/profile_manager.hpp"
 #include "online/xml_request.hpp"
 #include "states_screens/dialogs/user_info_dialog.hpp"

src/states_screens/online/online_user_search.hpp

@@ -19,11 +19,14 @@
 #define HEADER_ONLINE_USER_SEARCH_HPP
 
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets.hpp"
 #include "online/online_profile.hpp"
 #include "utils/ptr_vector.hpp"
 
-namespace GUIEngine { class Widget; }
+namespace GUIEngine
+{
+    class ButtonWidget; class IconButtonWidget; class ListWidget;
+    class TextBoxWidget; class Widget;
+}
 
 namespace Online { class XMLRequest; }