Removed unnecessary #include of user_config.hpp in other hpp files

(to reduce the amount of recompilation when user_config.hpp is changed).

src/addons/addons_manager.cpp

@@ -22,6 +22,7 @@
 
 #include "addons/news_manager.hpp"
 #include "addons/zip.hpp"
+#include "config/user_config.hpp"
 #include "io/file_manager.hpp"
 #include "io/xml_node.hpp"
 #include "karts/kart_properties.hpp"

src/challenges/unlock_manager.hpp

@@ -21,8 +21,6 @@
 
 #include <map>
 
-#include "config/user_config.hpp"
-
 #include "challenges/challenge_data.hpp"
 #include "challenges/story_mode_status.hpp"
 

src/config/player_profile.hpp

@@ -20,7 +20,6 @@
 #define HEADER_PLAYER_PROFILE_HPP
 
 #include "challenges/story_mode_status.hpp"
-#include "config/user_config.hpp"
 #include "utils/no_copy.hpp"
 #include "utils/types.hpp"
 

src/graphics/slip_stream.cpp

@@ -18,6 +18,7 @@
 
 #include "graphics/slip_stream.hpp"
 
+#include "config/user_config.hpp"
 #include "graphics/material.hpp"
 #include "graphics/material_manager.hpp"
 #include "graphics/irr_driver.hpp"

src/guiengine/abstract_state_manager.cpp

@@ -18,14 +18,16 @@
 
 #include "guiengine/abstract_state_manager.hpp"
 
-#include <vector>
-#include <iostream>
-
+#include "config/user_config.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "guiengine/screen.hpp"
 #include "input/device_manager.hpp"
 
+#include <vector>
+#include <iostream>
+
+
 using namespace GUIEngine;
 
 

src/guiengine/engine.cpp

@@ -648,9 +648,10 @@ namespace GUIEngine
 
 #include "guiengine/engine.hpp"
 
-#include "io/file_manager.hpp"
+#include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "input/input_manager.hpp"
+#include "io/file_manager.hpp"
 #include "guiengine/event_handler.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "guiengine/scalable_font.hpp"

src/guiengine/event_handler.cpp

@@ -17,11 +17,7 @@
 
 #include "guiengine/event_handler.hpp"
 
-#include <iostream>
-
-#include <IGUIEnvironment.h>
-#include <IGUIListBox.h>
-
+#include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "guiengine/abstract_state_manager.hpp"
 #include "guiengine/engine.hpp"
@@ -37,6 +33,12 @@
 #include "utils/debug.hpp"
 #include "utils/profiler.hpp"
 
+
+#include <IGUIEnvironment.h>
+#include <IGUIListBox.h>
+
+#include <iostream>
+
 using GUIEngine::EventHandler;
 using GUIEngine::EventPropagation;
 

src/input/input_manager.cpp

@@ -17,13 +17,14 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "input/input_manager.hpp"
-#include "main_loop.hpp"
+
+#include "config/user_config.hpp"
 #include "graphics/camera.hpp"
+#include "graphics/irr_driver.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/event_handler.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "guiengine/screen.hpp"
-#include "graphics/irr_driver.hpp"
 #include "input/device_manager.hpp"
 #include "input/input.hpp"
 #include "karts/controller/controller.hpp"

src/input/wiimote.cpp

@@ -20,6 +20,7 @@
 
 #include "input/wiimote.hpp"
 
+#include "config/user_config.hpp"
 #include "input/device_manager.hpp"
 #include "utils/string_utils.hpp"
 

src/items/rubber_ball.cpp

@@ -21,6 +21,7 @@
 #include "audio/sfx_base.hpp"
 #include "audio/sfx_manager.hpp"
 #include "config/stk_config.hpp"
+#include "config/user_config.hpp"
 #include "io/xml_node.hpp"
 #include "items/attachment.hpp"
 #include "items/projectile_manager.hpp"

src/karts/controller/ai_base_controller.cpp

@@ -19,8 +19,7 @@
 
 #include "karts/controller/ai_base_controller.hpp"
 
-#include <assert.h>
-
+#include "config/user_config.hpp"
 #include "karts/abstract_kart.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/skidding_properties.hpp"
@@ -29,6 +28,8 @@
 #include "tracks/track.hpp"
 #include "utils/constants.hpp"
 
+#include <assert.h>
+
 bool AIBaseController::m_ai_debug = false;
 
 /**

src/karts/controller/network_player_controller.cpp

@@ -1,5 +1,6 @@
 #include "karts/controller/network_player_controller.hpp"
 
+#include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/post_processing.hpp"
 #include "input/input_manager.hpp"

src/karts/controller/player_controller.cpp

@@ -22,6 +22,7 @@
 #include "audio/sfx_base.hpp"
 #include "audio/sfx_manager.hpp"
 #include "config/stk_config.hpp"
+#include "config/user_config.hpp"
 #include "graphics/camera.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/post_processing.hpp"

src/modes/demo_world.cpp

@@ -19,6 +19,7 @@
 #include "modes/demo_world.hpp"
 
 #include "config/player_manager.hpp"
+#include "config/user_config.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "input/device_manager.hpp"
 #include "input/input_manager.hpp"

src/modes/linear_world.cpp

@@ -17,11 +17,10 @@
 
 #include "modes/linear_world.hpp"
 
-#include <iostream>
-
 #include "audio/music_manager.hpp"
 #include "audio/sfx_base.hpp"
 #include "audio/sfx_manager.hpp"
+#include "config/user_config.hpp"
 #include "karts/abstract_kart.hpp"
 #include "karts/controller/controller.hpp"
 #include "karts/kart_properties.hpp"
@@ -34,6 +33,8 @@
 #include "utils/string_utils.hpp"
 #include "utils/translation.hpp"
 
+#include <iostream>
+
 //-----------------------------------------------------------------------------
 /** Constructs the linear world. Note that here no functions can be called
  *  that use World::getWorld(), since it is not yet defined.

src/modes/overworld.cpp

@@ -15,9 +15,12 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include "modes/overworld.hpp"
+
 #include "audio/music_manager.hpp"
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"
+#include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "input/device_manager.hpp"
 #include "input/input.hpp"
@@ -26,7 +29,6 @@
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"
 #include "karts/rescue_animation.hpp"
-#include "modes/overworld.hpp"
 #include "physics/physics.hpp"
 #include "states_screens/dialogs/select_challenge.hpp"
 #include "states_screens/offline_kart_selection.hpp"

src/modes/world_status.cpp

@@ -21,6 +21,7 @@
 #include "audio/sfx_manager.hpp"
 #include "audio/sfx_base.hpp"
 #include "config/stk_config.hpp"
+#include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "karts/abstract_kart.hpp"

src/states_screens/addons_screen.cpp

@@ -17,10 +17,9 @@
 
 #include "states_screens/addons_screen.hpp"
 
-#include <iostream>
-
 #include "addons/addons_manager.hpp"
 #include "addons/news_manager.hpp"
+#include "config/user_config.hpp"
 #include "guiengine/CGUISpriteBank.h"
 #include "guiengine/modaldialog.hpp"
 #include "guiengine/scalable_font.hpp"
@@ -34,6 +33,8 @@
 #include "utils/translation.hpp"
 #include "utils/ptr_vector.hpp"
 
+#include <iostream>
+
 DEFINE_SCREEN_SINGLETON( AddonsScreen );
 
 using namespace Online;

src/states_screens/arenas_screen.cpp

@@ -17,6 +17,7 @@
 
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"
+#include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/dynamic_ribbon_widget.hpp"

src/states_screens/create_server_screen.cpp

@@ -19,20 +19,22 @@
 
 #include "states_screens/create_server_screen.hpp"
 
-#include <string>
-#include <iostream>
-
-#include "challenges/unlock_manager.hpp"
 #include "audio/sfx_manager.hpp"
+#include "challenges/unlock_manager.hpp"
+#include "modes/demo_world.hpp"
+#include "online/servers_manager.hpp"
+#include "online/messages.hpp"
 #include "states_screens/online_screen.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"
-#include "modes/demo_world.hpp"
-#include "utils/translation.hpp"
 #include "states_screens/networking_lobby.hpp"
 #include "states_screens/dialogs/server_info_dialog.hpp"
-#include "online/servers_manager.hpp"
-#include "online/messages.hpp"
+#include "utils/translation.hpp"
+
+#include <irrString.h>
+
+#include <string>
+#include <iostream>
 
 
 using namespace GUIEngine;
@@ -121,7 +123,7 @@ void CreateServerScreen::onUpdate(float delta)
 // ----------------------------------------------------------------------------
 void CreateServerScreen::serverCreationRequest()
 {
-    const stringw name = m_name_widget->getText().trim();
+    const irr::core::stringw name = m_name_widget->getText().trim();
     const int max_players = m_max_players_widget->getValue();
     m_info_widget->setErrorColor();
     if (name.size() < 4 || name.size() > 30)

src/states_screens/dialogs/change_password_dialog.cpp

@@ -17,8 +17,6 @@
 
 #include "states_screens/dialogs/change_password_dialog.hpp"
 
-#include <IGUIEnvironment.h>
-
 #include "audio/sfx_manager.hpp"
 #include "guiengine/engine.hpp"
 #include "states_screens/state_manager.hpp"
@@ -26,9 +24,12 @@
 #include "utils/string_utils.hpp"
 #include "online/messages.hpp"
 
+#include <IGUIEnvironment.h>
+#include <irrString.h>
 
 using namespace GUIEngine;
 using namespace irr;
+using namespace irr::core;
 using namespace irr::gui;
 using namespace Online;
 

src/states_screens/dialogs/recovery_dialog.cpp

@@ -17,8 +17,6 @@
 
 #include "states_screens/dialogs/recovery_dialog.hpp"
 
-#include <IGUIEnvironment.h>
-
 #include "audio/sfx_manager.hpp"
 #include "guiengine/engine.hpp"
 #include "states_screens/state_manager.hpp"
@@ -26,6 +24,7 @@
 #include "utils/string_utils.hpp"
 #include "online/messages.hpp"
 
+#include <IGUIEnvironment.h>
 
 using namespace GUIEngine;
 using namespace irr;
@@ -103,8 +102,8 @@ bool RecoveryDialog::onEscapePressed()
 
 void RecoveryDialog::processInput()
 {
-    const stringw username = m_username_widget->getText().trim();
-    const stringw email = m_email_widget->getText().trim();
+    const core::stringw username = m_username_widget->getText().trim();
+    const core::stringw email = m_email_widget->getText().trim();
     if (username.size() < 4 || username.size() > 30 || email.size() < 4 || email.size() > 50)
     {
         sfx_manager->quickSound("anvil");

src/states_screens/dialogs/track_info_dialog.cpp

@@ -19,6 +19,7 @@
 
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"
+#include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/screen.hpp"

src/states_screens/easter_egg_screen.cpp

@@ -19,6 +19,7 @@
 
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"
+#include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/dynamic_ribbon_widget.hpp"

src/states_screens/help_screen_1.cpp

@@ -19,6 +19,7 @@
 
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"
+#include "config/user_config.hpp"
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/list_widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"

src/states_screens/login_screen.cpp

@@ -32,7 +32,10 @@
 #include "utils/log.hpp"
 #include "utils/translation.hpp"
 
+#include <irrString.h>
+
 using namespace GUIEngine;
+using namespace irr;
 
 DEFINE_SCREEN_SINGLETON( LoginScreen );
 
@@ -76,9 +79,9 @@ void LoginScreen::login()
     info_widget->setDefaultColor();
     info_widget->setText("", false);
 
-    const stringw username = getWidget<TextBoxWidget>("username")
+    const core::stringw username = getWidget<TextBoxWidget>("username")
                             ->getText().trim();
-    const stringw password = getWidget<TextBoxWidget>("password")
+    const core::stringw password = getWidget<TextBoxWidget>("password")
                             ->getText().trim();
 
     if (username.size() < 4 || username.size() > 30 || 

src/states_screens/main_menu_screen.cpp

@@ -22,6 +22,7 @@
 #include "addons/news_manager.hpp"
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"
+#include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/widgets/label_widget.hpp"

src/states_screens/network_kart_selection.cpp

@@ -2,6 +2,7 @@
 
 #include "audio/sfx_manager.hpp"
 #include "challenges/unlock_manager.hpp"
+#include "config/user_config.hpp"
 #include "items/item_manager.hpp"
 #include "karts/kart_properties.hpp"
 #include "karts/kart_properties_manager.hpp"

src/states_screens/options_screen_audio.cpp

@@ -20,6 +20,7 @@
 #include "audio/music_manager.hpp"
 #include "audio/sfx_manager.hpp"
 #include "audio/sfx_base.hpp"
+#include "config/user_config.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widgets/check_box_widget.hpp"
 #include "guiengine/widgets/dynamic_ribbon_widget.hpp"

src/states_screens/options_screen_input2.cpp

@@ -17,6 +17,7 @@
 
 #include "states_screens/options_screen_input2.hpp"
 
+#include "config/user_config.hpp"
 #include "guiengine/CGUISpriteBank.h"
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/screen.hpp"

src/states_screens/options_screen_players.cpp

@@ -18,9 +18,10 @@
 #include "states_screens/options_screen_players.hpp"
 
 #include "challenges/unlock_manager.hpp"
+#include "config/device_config.hpp"
 #include "config/player_manager.hpp"
 #include "config/player_profile.hpp"
-#include "config/device_config.hpp"
+#include "config/user_config.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/screen.hpp"

src/states_screens/options_screen_ui.cpp

@@ -21,6 +21,7 @@
 #include "audio/music_manager.hpp"
 #include "audio/sfx_manager.hpp"
 #include "audio/sfx_base.hpp"
+#include "config/user_config.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widgets/button_widget.hpp"

src/states_screens/options_screen_video.cpp

@@ -20,6 +20,7 @@
 #include "audio/music_manager.hpp"
 #include "audio/sfx_manager.hpp"
 #include "audio/sfx_base.hpp"
+#include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widgets/button_widget.hpp"

src/states_screens/race_gui_base.cpp

@@ -21,6 +21,7 @@
 #include "states_screens/race_gui_base.hpp"
 
 #include "audio/music_manager.hpp"
+#include "config/user_config.hpp"
 #include "graphics/camera.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/irr_driver.hpp"

src/states_screens/race_result_gui.cpp

@@ -22,6 +22,7 @@
 #include "audio/sfx_base.hpp"
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"
+#include "config/user_config.hpp"
 #include "graphics/glwrap.hpp"
 #include "graphics/material.hpp"
 #include "guiengine/engine.hpp"

src/states_screens/race_setup_screen.cpp

@@ -19,6 +19,7 @@
 
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"
+#include "config/user_config.hpp"
 #include "guiengine/widgets/dynamic_ribbon_widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets/spinner_widget.hpp"

src/states_screens/soccer_setup_screen.cpp

@@ -17,20 +17,22 @@
 
 #include "states_screens/soccer_setup_screen.hpp"
 
-#include "input/device_manager.hpp"
-#include "input/input_manager.hpp"
-#include "states_screens/state_manager.hpp"
-#include "states_screens/arenas_screen.hpp"
+#include "config/user_config.hpp"
 #include "guiengine/widgets/button_widget.hpp"
 #include "guiengine/widgets/spinner_widget.hpp"
 #include "guiengine/widgets/check_box_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
 #include "guiengine/widgets/model_view_widget.hpp"
 #include "guiengine/scalable_font.hpp"
+#include "input/device_manager.hpp"
+#include "input/input_manager.hpp"
 #include "io/file_manager.hpp"
-#include "karts/kart_properties_manager.hpp"
-#include "karts/kart_properties.hpp"
 #include "karts/kart_model.hpp"
+#include "karts/kart_properties.hpp"
+#include "karts/kart_properties_manager.hpp"
+#include "states_screens/arenas_screen.hpp"
+#include "states_screens/state_manager.hpp"
+
 
 using namespace GUIEngine;
 DEFINE_SCREEN_SINGLETON( SoccerSetupScreen );

src/states_screens/story_mode_lobby.cpp

@@ -19,6 +19,7 @@
 
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"
+#include "config/user_config.hpp"
 #include "guiengine/widgets/check_box_widget.hpp"
 #include "guiengine/widgets/list_widget.hpp"
 #include "states_screens/dialogs/enter_player_name_dialog.hpp"

src/states_screens/tracks_screen.cpp

@@ -19,6 +19,7 @@
 
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"
+#include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/dynamic_ribbon_widget.hpp"

src/tracks/check_cannon.cpp

@@ -20,6 +20,7 @@
 
 #include "animations/animation_base.hpp"
 #include "animations/ipo.hpp"
+#include "config/user_config.hpp"
 #include "graphics/show_curve.hpp"
 #include "io/xml_node.hpp"
 #include "karts/abstract_kart.hpp"

src/tracks/check_goal.cpp

@@ -18,10 +18,12 @@
 
 #include "tracks/check_goal.hpp"
 
+#include "config/user_config.hpp"
 #include "io/xml_node.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_object_manager.hpp"
 #include "modes/soccer_world.hpp"
+
 #include <stdio.h>
 
 /** Constructor for a check goal line.
@@ -77,7 +79,7 @@ void CheckGoal::update(float dt)
         m_previous_position[ball_index] = xyz;
         ball_index++;
     }
-}
+}   // update
 
 // ----------------------------------------------------------------------------
 /** Called when the check line is triggered. This function  creates a cannon
@@ -89,13 +91,15 @@ void CheckGoal::trigger(unsigned int kart_index)
     SoccerWorld* world = dynamic_cast<SoccerWorld*>(World::getWorld());
     if(!world)
     {
-        fprintf(stderr, "WARNING: no soccer world found, cannot count the points\n");
+        Log::warn("CheckGoal", 
+                  "No soccer world found, cannot count the points.");
         return;
     }
 
     world->onCheckGoalTriggered(m_first_goal);
-}   // CheckGoal
+}   // trigger
 
+// ----------------------------------------------------------------------------
 bool CheckGoal::isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
                             unsigned int indx)
 {
@@ -108,6 +112,7 @@ bool CheckGoal::isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
 
 }   // isTriggered
 
+// ----------------------------------------------------------------------------
 void CheckGoal::reset(const Track &track)
 {
     const TrackObjectManager* tom = track.getTrackObjectManager();

src/tracks/check_lap.cpp

@@ -20,6 +20,7 @@
 
 #include <string>
 
+#include "config/user_config.hpp"
 #include "io/xml_node.hpp"
 #include "karts/abstract_kart.hpp"
 #include "modes/linear_world.hpp"

src/tracks/check_line.cpp

@@ -18,6 +18,7 @@
 
 #include "tracks/check_line.hpp"
 
+#include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "io/xml_node.hpp"
 #include "karts/abstract_kart.hpp"

src/tracks/check_structure.cpp

@@ -18,8 +18,7 @@
 
 #include "tracks/check_structure.hpp"
 
-#include <algorithm>
-
+#include "config/user_config.hpp"
 #include "io/xml_node.hpp"
 #include "karts/abstract_kart.hpp"
 #include "modes/linear_world.hpp"
@@ -28,6 +27,8 @@
 #include "tracks/check_lap.hpp"
 #include "tracks/check_manager.hpp"
 
+#include <algorithm>
+
 
 CheckStructure::CheckStructure(const XMLNode &node, unsigned int index)
 {

src/tracks/track_object_presentation.cpp

@@ -21,6 +21,7 @@
 #include "audio/sfx_base.hpp"
 #include "audio/sfx_buffer.hpp"
 #include "challenges/unlock_manager.hpp"
+#include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "graphics/material_manager.hpp"
 #include "graphics/particle_emitter.hpp"