diff options
| author | Glenn Rice <glennricster@gmail.com> | 2011-02-28 20:40:15 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2011-02-28 20:40:15 +0000 |
| commit | ba54fac9eb74be6f73e20e2de953cf6f355be57f (patch) | |
| tree | ee496d869da4f8a7026b94991fe33f560cb9851a /Source/Core/InputCommon | |
| parent | 1b8f4760247934e3bac649d45a887d304b5eb724 (diff) | |
Convert GetUserPath to return a std::string instead of a const char *. This simplifies its usage in most cases.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7265 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/Src/InputConfig.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp index c8813b532c..b9d2a93b99 100644 --- a/Source/Core/InputCommon/Src/InputConfig.cpp +++ b/Source/Core/InputCommon/Src/InputConfig.cpp @@ -29,7 +29,7 @@ InputPlugin::~InputPlugin() bool InputPlugin::LoadConfig() { IniFile inifile; - if (inifile.Load(std::string(File::GetUserPath(D_CONFIG_IDX)) + ini_name + ".ini")) + if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + ini_name + ".ini")) { std::vector< ControllerEmu* >::const_iterator i = controllers.begin(), @@ -53,7 +53,7 @@ bool InputPlugin::LoadConfig() void InputPlugin::SaveConfig() { - std::string ini_filename = (std::string(File::GetUserPath(D_CONFIG_IDX)) + ini_name + ".ini" ); + std::string ini_filename = File::GetUserPath(D_CONFIG_IDX) + ini_name + ".ini"; IniFile inifile; inifile.Load(ini_filename); |