Renamed player.?pp to player_profile.?pp (to follow our style

guide); removed unnecessary #includes.

sources.cmake

@@ -22,8 +22,8 @@ src/challenges/challenge_data.cpp
 src/challenges/game_slot.cpp
 src/challenges/unlock_manager.cpp
 src/config/device_config.cpp
-src/config/player.cpp
 src/config/player_manager.cpp
+src/config/player_profile.cpp
 src/config/saved_grand_prix.cpp
 src/config/stk_config.cpp
 src/config/user_config.cpp
@@ -351,8 +351,8 @@ src/challenges/challenge_data.hpp
 src/challenges/game_slot.hpp
 src/challenges/unlock_manager.hpp
 src/config/device_config.hpp
-src/config/player.hpp
 src/config/player_manager.hpp
+src/config/player_profile.hpp
 src/config/saved_grand_prix.hpp
 src/config/stk_config.hpp
 src/config/user_config.hpp

src/achievements/achievements_manager.cpp

@@ -18,8 +18,8 @@
 
 #include "achievements/achievements_manager.hpp"
 
-#include "config/player.hpp"
 #include "config/player_manager.hpp"
+#include "config/player_profile.hpp"
 #include "config/user_config.hpp"
 #include "io/file_manager.hpp"
 #include "online/current_user.hpp"

src/challenges/unlock_manager.cpp

@@ -23,8 +23,8 @@
 #include "audio/sfx_base.hpp"
 #include "audio/sfx_manager.hpp"
 #include "challenges/challenge_data.hpp"
-#include "config/player.hpp"
 #include "config/player_manager.hpp"
+#include "config/player_profile.hpp"
 #include "config/user_config.hpp"
 #include "io/file_manager.hpp"
 #include "karts/kart_properties_manager.hpp"

src/config/player_manager.cpp

@@ -19,7 +19,7 @@
 #include "config/player_manager.hpp"
 
 #include "achievements/achievements_manager.hpp"
-#include "config/player.hpp"
+#include "config/player_profile.hpp"
 #include "io/file_manager.hpp"
 #include "io/utf_writer.hpp"
 #include "io/xml_node.hpp"

src/config/player_profile.cpp

@@ -16,7 +16,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 "config/player.hpp"
+#include "config/player_profile.hpp"
 
 #include "challenges/game_slot.hpp"
 #include "challenges/unlock_manager.hpp"

src/config/user_config.cpp

@@ -31,7 +31,7 @@ static PtrVector<UserConfigParam, REF> all_params;
 #define PARAM_DEFAULT(X) = X
 #include "config/user_config.hpp"
 
-#include "config/player.hpp"
+#include "config/player_profile.hpp"
 #include "config/saved_grand_prix.hpp"
 #include "config/stk_config.hpp"
 #include "guiengine/engine.hpp"

src/input/device_manager.cpp

@@ -21,7 +21,6 @@
 #include <iostream>
 #include <fstream>
 
-#include "config/player.hpp"
 #include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "input/wiimote_manager.hpp"

src/karts/controller/network_player_controller.cpp

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

src/karts/controller/player_controller.cpp

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

src/karts/controller/player_controller.hpp

@@ -21,7 +21,6 @@
 #ifndef HEADER_PLAYERKART_HPP
 #define HEADER_PLAYERKART_HPP
 
-#include "config/player.hpp"
 #include "karts/controller/controller.hpp"
 
 class AbstractKart;

src/karts/kart_properties_manager.cpp

@@ -20,8 +20,8 @@
 #include "karts/kart_properties_manager.hpp"
 
 #include "challenges/unlock_manager.hpp"
-#include "config/player.hpp"
 #include "config/player_manager.hpp"
+#include "config/player_profile.hpp"
 #include "config/stk_config.hpp"
 #include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"

src/main.cpp

@@ -146,8 +146,8 @@
 #include "audio/music_manager.hpp"
 #include "audio/sfx_manager.hpp"
 #include "challenges/unlock_manager.hpp"
-#include "config/player.hpp"
 #include "config/player_manager.hpp"
+#include "config/player_profile.hpp"
 #include "config/stk_config.hpp"
 #include "config/user_config.hpp"
 #include "graphics/hardware_skinning.hpp"

src/race/grand_prix_data.cpp

@@ -19,7 +19,7 @@
 
 #include "race/grand_prix_data.hpp"
 
-#include "config/player.hpp"
+#include "config/player_profile.hpp"
 #include "challenges/unlock_manager.hpp"
 #include "config/player_manager.hpp"
 #include "io/file_manager.hpp"

src/states_screens/cutscene_gui.cpp

@@ -16,6 +16,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 "config/user_config.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "graphics/irr_driver.hpp"

src/states_screens/cutscene_gui.hpp

@@ -25,7 +25,6 @@
 #include <irrString.h>
 using namespace irr;
 
-#include "config/player.hpp"
 #include "states_screens/race_gui_base.hpp"
 #include "utils/cpp2011.h"
 

src/states_screens/dialogs/add_device_dialog.cpp

@@ -17,7 +17,6 @@
 
 #include "states_screens/dialogs/add_device_dialog.hpp"
 
-#include "config/player.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/widget.hpp"

src/states_screens/dialogs/add_device_dialog.hpp

@@ -19,7 +19,6 @@
 #ifndef HEADER_ADD_DEVICE_DIALOG_HPP
 #define HEADER_ADD_DEVICE_DIALOG_HPP
 
-#include "config/player.hpp"
 #include "guiengine/modaldialog.hpp"
 
 /**

src/states_screens/dialogs/change_password_dialog.cpp

@@ -20,7 +20,6 @@
 #include <IGUIEnvironment.h>
 
 #include "audio/sfx_manager.hpp"
-#include "config/player.hpp"
 #include "guiengine/engine.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"

src/states_screens/dialogs/confirm_resolution_dialog.hpp

@@ -19,7 +19,6 @@
 #ifndef HEADER_CONFIRM_RES_DIALOG_HPP
 #define HEADER_CONFIRM_RES_DIALOG_HPP
 
-#include "config/player.hpp"
 #include "guiengine/modaldialog.hpp"
 
 /**

src/states_screens/dialogs/enter_player_name_dialog.cpp

@@ -21,8 +21,8 @@
 
 #include "audio/sfx_manager.hpp"
 #include "challenges/unlock_manager.hpp"
-#include "config/player.hpp"
 #include "config/player_manager.hpp"
+#include "config/player_profile.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/widgets/button_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"

src/states_screens/dialogs/message_dialog.hpp

@@ -19,7 +19,6 @@
 #ifndef HEADER_CONFIRM_DIALOG_HPP
 #define HEADER_CONFIRM_DIALOG_HPP
 
-#include "config/player.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "utils/leak_check.hpp"
 

src/states_screens/dialogs/player_info_dialog.cpp

@@ -22,8 +22,8 @@
 
 #include "audio/sfx_manager.hpp"
 #include "challenges/unlock_manager.hpp"
-#include "config/player.hpp"
 #include "config/player_manager.hpp"
+#include "config/player_profile.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/widgets/button_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"

src/states_screens/dialogs/player_info_dialog.hpp

@@ -19,9 +19,10 @@
 #ifndef HEADER_PLAYERINFO_DIALOG_HPP
 #define HEADER_PLAYERINFO_DIALOG_HPP
 
-#include "config/player.hpp"
 #include "guiengine/modaldialog.hpp"
 
+class PlayerProfile;
+
 namespace GUIEngine
 {
     class TextBoxWidget;

src/states_screens/dialogs/recovery_dialog.cpp

@@ -20,7 +20,6 @@
 #include <IGUIEnvironment.h>
 
 #include "audio/sfx_manager.hpp"
-#include "config/player.hpp"
 #include "guiengine/engine.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"

src/states_screens/dialogs/registration_dialog.cpp

@@ -20,7 +20,6 @@
 #include <IGUIEnvironment.h>
 
 #include "audio/sfx_manager.hpp"
-#include "config/player.hpp"
 #include "guiengine/engine.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/register_screen.hpp"

src/states_screens/dialogs/server_info_dialog.cpp

@@ -20,7 +20,6 @@
 #include <IGUIEnvironment.h>
 
 #include "audio/sfx_manager.hpp"
-#include "config/player.hpp"
 #include "guiengine/engine.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"

src/states_screens/dialogs/tutorial_message_dialog.hpp

@@ -19,7 +19,6 @@
 #ifndef HEADER_TUTORIAL_DIALOG_HPP
 #define HEADER_TUTORIAL_DIALOG_HPP
 
-#include "config/player.hpp"
 #include "guiengine/modaldialog.hpp"
 #include "utils/cpp2011.h"
 #include "utils/leak_check.hpp"

src/states_screens/kart_selection.cpp

@@ -19,8 +19,8 @@
 #include "states_screens/kart_selection.hpp"
 
 #include "challenges/unlock_manager.hpp"
-#include "config/player.hpp"
 #include "config/player_manager.hpp"
+#include "config/player_profile.hpp"
 #include "config/user_config.hpp"
 #include "graphics/irr_driver.hpp"
 #include "guiengine/engine.hpp"

src/states_screens/options_screen_players.cpp

@@ -18,8 +18,8 @@
 #include "states_screens/options_screen_players.hpp"
 
 #include "challenges/unlock_manager.hpp"
-#include "config/player.hpp"
 #include "config/player_manager.hpp"
+#include "config/player_profile.hpp"
 #include "config/device_config.hpp"
 #include "guiengine/engine.hpp"
 #include "guiengine/scalable_font.hpp"

src/states_screens/race_gui.hpp

@@ -26,7 +26,6 @@
 #include <irrString.h>
 using namespace irr;
 
-#include "config/player.hpp"
 #include "states_screens/race_gui_base.hpp"
 
 class AbstractKart;

src/states_screens/race_gui_overworld.hpp

@@ -27,7 +27,6 @@
 #include <irrString.h>
 using namespace irr;
 
-#include "config/player.hpp"
 #include "states_screens/race_gui_base.hpp"
 
 class AbstractKart;

src/states_screens/state_manager.hpp

@@ -27,7 +27,7 @@
 
 #include <string>
 
-#include "config/player.hpp"
+#include "config/player_profile.hpp"
 #include "guiengine/abstract_state_manager.hpp"
 #include "utils/ptr_vector.hpp"