piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Light cleanup to a little bit of InputCommon. Replaces much of the iterators that litter this section of the codebase.

Browse Source 
Also clean up a little bit of the comments that describe the interface classes.
This commit is contained in:
Lioncash
2014-01-30 19:51:21 -05:00
parent b5b02de663
commit d91a5abba1
13 changed files with 301 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Source/Core/InputCommon/InputConfig.cpp
View File

@ -10,10 +10,8 @@
InputPlugin::~InputPlugin()
{
// delete pads
std::vector<ControllerEmu*>::const_iterator i = controllers.begin(),
e = controllers.end();
for ( ; i != e; ++i )
delete *i;
for (ControllerEmu* pad : controllers)
delete pad;
}
bool InputPlugin::LoadConfig(bool isGC)
@ -58,25 +56,26 @@ bool InputPlugin::LoadConfig(bool isGC)
if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + ini_name + ".ini"))
{
std::vector< ControllerEmu* >::const_iterator
i = controllers.begin(),
e = controllers.end();
for (int n = 0; i!=e; ++i, ++n)
int n = 0;
for (ControllerEmu* pad : controllers)
{
// load settings from ini
// Load settings from ini
if (useProfile[n])
{
IniFile profile_ini;
profile_ini.Load(File::GetUserPath(D_CONFIG_IDX) + path + profile[n] + ".ini");
(*i)->LoadConfig(profile_ini.GetOrCreateSection("Profile"));
pad->LoadConfig(profile_ini.GetOrCreateSection("Profile"));
}
else
{
(*i)->LoadConfig(inifile.GetOrCreateSection((*i)->GetName().c_str()));
pad->LoadConfig(inifile.GetOrCreateSection(pad->GetName().c_str()));
}
// update refs
(*i)->UpdateReferences(g_controller_interface);
// Update refs
pad->UpdateReferences(g_controller_interface);
// Next profile
n++;
}
return true;
}
@ -95,10 +94,8 @@ void InputPlugin::SaveConfig()
IniFile inifile;
inifile.Load(ini_filename);
std::vector< ControllerEmu* >::const_iterator i = controllers.begin(),
e = controllers.end();
for ( ; i!=e; ++i )
(*i)->SaveConfig(inifile.GetOrCreateSection((*i)->GetName().c_str()));
for (ControllerEmu* pad : controllers)
pad->SaveConfig(inifile.GetOrCreateSection(pad->GetName().c_str()));
inifile.Save(ini_filename);
}