diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2014-02-12 16:00:34 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2014-02-13 09:05:50 +0100 |
| commit | 404624bf0b0125e5a408021c616ee9b9e2dde382 (patch) | |
| tree | d2c3cd6256b09ebdc04b8c913b21c2e56d30c2e1 /Source/Core/DolphinWX/ConfigMain.cpp | |
| parent | 2ff794d299b0426d1f2a523523260efad84a9837 (diff) | |
Turn loops into range-based form
and some things suggested by cppcheck and compiler warnings.
Diffstat (limited to 'Source/Core/DolphinWX/ConfigMain.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ConfigMain.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index 46187d0da7..75f0d17d94 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -184,7 +184,7 @@ CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title, CreateGUIControls(); // Update selected ISO paths - for(auto& folder : SConfig::GetInstance().m_ISOFolder) + for(const std::string& folder : SConfig::GetInstance().m_ISOFolder) { ISOPaths->Append(StrToWxStr(folder)); } @@ -250,7 +250,7 @@ void CConfigMain::InitializeGUILists() arrayStringFor_Framelimit.Add(wxString::Format(wxT("%i"), i)); // Emulator Engine - for (auto& CPUCores_a : CPUCores) + for (const CPUCore& CPUCores_a : CPUCores) arrayStringFor_CPUEngine.Add(wxGetTranslation(CPUCores_a.name)); // DSP Engine @@ -979,12 +979,9 @@ void CConfigMain::AudioSettingsChanged(wxCommandEvent& event) void CConfigMain::AddAudioBackends() { - std::vector<std::string> backends = AudioCommon::GetSoundBackends(); - // I'm sure Billiard will change this into an auto sometimes soon :P - for (std::vector<std::string>::const_iterator iter = backends.begin(); - iter != backends.end(); ++iter) + for (const std::string& backend : AudioCommon::GetSoundBackends()) { - BackendSelection->Append(wxGetTranslation(StrToWxStr(*iter))); + BackendSelection->Append(wxGetTranslation(StrToWxStr(backend))); int num = BackendSelection-> FindString(StrToWxStr(SConfig::GetInstance().sBackend)); BackendSelection->SetSelection(num); |