From 2b4729a145ddf10e8b68b46fcfcb031977139cbb Mon Sep 17 00:00:00 2001 From: hiker Date: Mon, 17 Feb 2014 20:10:29 +1100 Subject: [PATCH] Renamed player.?pp to player_profile.?pp (to follow our style guide); removed unnecessary #includes. --- sources.cmake | 4 ++-- src/achievements/achievements_manager.cpp | 2 +- src/challenges/unlock_manager.cpp | 2 +- src/config/player_manager.cpp | 2 +- src/config/{player.cpp => player_profile.cpp} | 2 +- src/config/{player.hpp => player_profile.hpp} | 0 src/config/user_config.cpp | 2 +- src/input/device_manager.cpp | 1 - src/karts/controller/network_player_controller.cpp | 1 - src/karts/controller/player_controller.cpp | 1 - src/karts/controller/player_controller.hpp | 1 - src/karts/kart_properties_manager.cpp | 2 +- src/main.cpp | 2 +- src/race/grand_prix_data.cpp | 2 +- src/states_screens/cutscene_gui.cpp | 1 + src/states_screens/cutscene_gui.hpp | 1 - src/states_screens/dialogs/add_device_dialog.cpp | 1 - src/states_screens/dialogs/add_device_dialog.hpp | 1 - src/states_screens/dialogs/change_password_dialog.cpp | 1 - src/states_screens/dialogs/confirm_resolution_dialog.hpp | 1 - src/states_screens/dialogs/enter_player_name_dialog.cpp | 2 +- src/states_screens/dialogs/message_dialog.hpp | 1 - src/states_screens/dialogs/player_info_dialog.cpp | 2 +- src/states_screens/dialogs/player_info_dialog.hpp | 3 ++- src/states_screens/dialogs/recovery_dialog.cpp | 1 - src/states_screens/dialogs/registration_dialog.cpp | 1 - src/states_screens/dialogs/server_info_dialog.cpp | 1 - src/states_screens/dialogs/tutorial_message_dialog.hpp | 1 - src/states_screens/kart_selection.cpp | 2 +- src/states_screens/options_screen_players.cpp | 2 +- src/states_screens/race_gui.hpp | 1 - src/states_screens/race_gui_overworld.hpp | 1 - src/states_screens/state_manager.hpp | 2 +- 33 files changed, 18 insertions(+), 32 deletions(-) rename src/config/{player.cpp => player_profile.cpp} (99%) rename src/config/{player.hpp => player_profile.hpp} (100%) diff --git a/sources.cmake b/sources.cmake index 00250cd3a..0c5e06da6 100644 --- a/sources.cmake +++ b/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 diff --git a/src/achievements/achievements_manager.cpp b/src/achievements/achievements_manager.cpp index 64e6b540a..6fb6bc2ba 100644 --- a/src/achievements/achievements_manager.cpp +++ b/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" diff --git a/src/challenges/unlock_manager.cpp b/src/challenges/unlock_manager.cpp index ae0e208e8..e6324b568 100644 --- a/src/challenges/unlock_manager.cpp +++ b/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" diff --git a/src/config/player_manager.cpp b/src/config/player_manager.cpp index 595e27d24..b4ebed864 100644 --- a/src/config/player_manager.cpp +++ b/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" diff --git a/src/config/player.cpp b/src/config/player_profile.cpp similarity index 99% rename from src/config/player.cpp rename to src/config/player_profile.cpp index 0c8c6f225..b1323b16a 100644 --- a/src/config/player.cpp +++ b/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" diff --git a/src/config/player.hpp b/src/config/player_profile.hpp similarity index 100% rename from src/config/player.hpp rename to src/config/player_profile.hpp diff --git a/src/config/user_config.cpp b/src/config/user_config.cpp index d1740acaa..a2e4db058 100644 --- a/src/config/user_config.cpp +++ b/src/config/user_config.cpp @@ -31,7 +31,7 @@ static PtrVector 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" diff --git a/src/input/device_manager.cpp b/src/input/device_manager.cpp index b0330a97a..dc1dca670 100644 --- a/src/input/device_manager.cpp +++ b/src/input/device_manager.cpp @@ -21,7 +21,6 @@ #include #include -#include "config/player.hpp" #include "config/user_config.hpp" #include "graphics/irr_driver.hpp" #include "input/wiimote_manager.hpp" diff --git a/src/karts/controller/network_player_controller.cpp b/src/karts/controller/network_player_controller.cpp index 84ebc105e..c82e59d08 100644 --- a/src/karts/controller/network_player_controller.cpp +++ b/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" diff --git a/src/karts/controller/player_controller.cpp b/src/karts/controller/player_controller.cpp index 776db3b81..74e9c88aa 100644 --- a/src/karts/controller/player_controller.cpp +++ b/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" diff --git a/src/karts/controller/player_controller.hpp b/src/karts/controller/player_controller.hpp index 5839c5992..56c44e292 100644 --- a/src/karts/controller/player_controller.hpp +++ b/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; diff --git a/src/karts/kart_properties_manager.cpp b/src/karts/kart_properties_manager.cpp index 8381e10ac..e573d9504 100644 --- a/src/karts/kart_properties_manager.cpp +++ b/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" diff --git a/src/main.cpp b/src/main.cpp index b0162be09..440cd1c9b 100644 --- a/src/main.cpp +++ b/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" diff --git a/src/race/grand_prix_data.cpp b/src/race/grand_prix_data.cpp index 21ccd8824..def7b336d 100644 --- a/src/race/grand_prix_data.cpp +++ b/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" diff --git a/src/states_screens/cutscene_gui.cpp b/src/states_screens/cutscene_gui.cpp index 5f8ee6a05..ac9c7b681 100644 --- a/src/states_screens/cutscene_gui.cpp +++ b/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" diff --git a/src/states_screens/cutscene_gui.hpp b/src/states_screens/cutscene_gui.hpp index 64deaa0aa..6a9703bc5 100644 --- a/src/states_screens/cutscene_gui.hpp +++ b/src/states_screens/cutscene_gui.hpp @@ -25,7 +25,6 @@ #include using namespace irr; -#include "config/player.hpp" #include "states_screens/race_gui_base.hpp" #include "utils/cpp2011.h" diff --git a/src/states_screens/dialogs/add_device_dialog.cpp b/src/states_screens/dialogs/add_device_dialog.cpp index eb8752dd9..fc272d11a 100644 --- a/src/states_screens/dialogs/add_device_dialog.cpp +++ b/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" diff --git a/src/states_screens/dialogs/add_device_dialog.hpp b/src/states_screens/dialogs/add_device_dialog.hpp index 033d6cc9f..8bac559ff 100644 --- a/src/states_screens/dialogs/add_device_dialog.hpp +++ b/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" /** diff --git a/src/states_screens/dialogs/change_password_dialog.cpp b/src/states_screens/dialogs/change_password_dialog.cpp index dd42330c4..cdaceb40f 100644 --- a/src/states_screens/dialogs/change_password_dialog.cpp +++ b/src/states_screens/dialogs/change_password_dialog.cpp @@ -20,7 +20,6 @@ #include #include "audio/sfx_manager.hpp" -#include "config/player.hpp" #include "guiengine/engine.hpp" #include "states_screens/state_manager.hpp" #include "utils/translation.hpp" diff --git a/src/states_screens/dialogs/confirm_resolution_dialog.hpp b/src/states_screens/dialogs/confirm_resolution_dialog.hpp index d4a9e01e5..5a03bfc72 100644 --- a/src/states_screens/dialogs/confirm_resolution_dialog.hpp +++ b/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" /** diff --git a/src/states_screens/dialogs/enter_player_name_dialog.cpp b/src/states_screens/dialogs/enter_player_name_dialog.cpp index 6df6ec015..0647a5cbf 100644 --- a/src/states_screens/dialogs/enter_player_name_dialog.cpp +++ b/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" diff --git a/src/states_screens/dialogs/message_dialog.hpp b/src/states_screens/dialogs/message_dialog.hpp index 6bc952b7d..3b56cc8f6 100644 --- a/src/states_screens/dialogs/message_dialog.hpp +++ b/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" diff --git a/src/states_screens/dialogs/player_info_dialog.cpp b/src/states_screens/dialogs/player_info_dialog.cpp index 4f0f2709c..b8f5b991a 100644 --- a/src/states_screens/dialogs/player_info_dialog.cpp +++ b/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" diff --git a/src/states_screens/dialogs/player_info_dialog.hpp b/src/states_screens/dialogs/player_info_dialog.hpp index a4820f236..63c7077c2 100644 --- a/src/states_screens/dialogs/player_info_dialog.hpp +++ b/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; diff --git a/src/states_screens/dialogs/recovery_dialog.cpp b/src/states_screens/dialogs/recovery_dialog.cpp index 8d4eb9f1e..f0275f779 100644 --- a/src/states_screens/dialogs/recovery_dialog.cpp +++ b/src/states_screens/dialogs/recovery_dialog.cpp @@ -20,7 +20,6 @@ #include #include "audio/sfx_manager.hpp" -#include "config/player.hpp" #include "guiengine/engine.hpp" #include "states_screens/state_manager.hpp" #include "utils/translation.hpp" diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp index f1e9626c8..aaf65ff56 100644 --- a/src/states_screens/dialogs/registration_dialog.cpp +++ b/src/states_screens/dialogs/registration_dialog.cpp @@ -20,7 +20,6 @@ #include #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" diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp index 124f99b25..3cc42f6c9 100644 --- a/src/states_screens/dialogs/server_info_dialog.cpp +++ b/src/states_screens/dialogs/server_info_dialog.cpp @@ -20,7 +20,6 @@ #include #include "audio/sfx_manager.hpp" -#include "config/player.hpp" #include "guiengine/engine.hpp" #include "states_screens/state_manager.hpp" #include "utils/translation.hpp" diff --git a/src/states_screens/dialogs/tutorial_message_dialog.hpp b/src/states_screens/dialogs/tutorial_message_dialog.hpp index cd10d0712..d8468788c 100644 --- a/src/states_screens/dialogs/tutorial_message_dialog.hpp +++ b/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" diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp index 6b71448e0..d777f3ede 100644 --- a/src/states_screens/kart_selection.cpp +++ b/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" diff --git a/src/states_screens/options_screen_players.cpp b/src/states_screens/options_screen_players.cpp index c1bf7264a..f89501d10 100644 --- a/src/states_screens/options_screen_players.cpp +++ b/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" diff --git a/src/states_screens/race_gui.hpp b/src/states_screens/race_gui.hpp index 12142b1eb..2a76ed23a 100644 --- a/src/states_screens/race_gui.hpp +++ b/src/states_screens/race_gui.hpp @@ -26,7 +26,6 @@ #include using namespace irr; -#include "config/player.hpp" #include "states_screens/race_gui_base.hpp" class AbstractKart; diff --git a/src/states_screens/race_gui_overworld.hpp b/src/states_screens/race_gui_overworld.hpp index a2901b52e..beed1b9c2 100644 --- a/src/states_screens/race_gui_overworld.hpp +++ b/src/states_screens/race_gui_overworld.hpp @@ -27,7 +27,6 @@ #include using namespace irr; -#include "config/player.hpp" #include "states_screens/race_gui_base.hpp" class AbstractKart; diff --git a/src/states_screens/state_manager.hpp b/src/states_screens/state_manager.hpp index 2b3559bdc..fff7bd61a 100644 --- a/src/states_screens/state_manager.hpp +++ b/src/states_screens/state_manager.hpp @@ -27,7 +27,7 @@ #include -#include "config/player.hpp" +#include "config/player_profile.hpp" #include "guiengine/abstract_state_manager.hpp" #include "utils/ptr_vector.hpp"