ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GeneralConfigPane: rename cpu_cores to m_cpu_cores

This commit is contained in:
Lioncash 2016-11-04 21:57:46 -04:00
parent 5d4c714662
commit 07e3835a49
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinWX/Config/GeneralConfigPane.cpp
View File

@ -21,7 +21,7 @@
GeneralConfigPane::GeneralConfigPane(wxWindow* parent, wxWindowID id) : wxPanel(parent, id) GeneralConfigPane::GeneralConfigPane(wxWindow* parent, wxWindowID id) : wxPanel(parent, id)
{ {
cpu_cores = { m_cpu_cores = {
{PowerPC::CORE_INTERPRETER, _("Interpreter (slowest)")}, {PowerPC::CORE_INTERPRETER, _("Interpreter (slowest)")},
{PowerPC::CORE_CACHEDINTERPRETER, _("Cached Interpreter (slower)")}, {PowerPC::CORE_CACHEDINTERPRETER, _("Cached Interpreter (slower)")},
#ifdef _M_X86_64 #ifdef _M_X86_64
@ -48,7 +48,7 @@ void GeneralConfigPane::InitializeGUI()
m_throttler_array_string.Add(wxString::Format(_("%i%%"), i)); m_throttler_array_string.Add(wxString::Format(_("%i%%"), i));
} }
for (const CPUCore& cpu_core : cpu_cores) for (const CPUCore& cpu_core : m_cpu_cores)
m_cpu_engine_array_string.Add(cpu_core.name); m_cpu_engine_array_string.Add(cpu_core.name);
m_dual_core_checkbox = new wxCheckBox(this, wxID_ANY, _("Enable Dual Core (speedup)")); m_dual_core_checkbox = new wxCheckBox(this, wxID_ANY, _("Enable Dual Core (speedup)"));
@ -154,9 +154,9 @@ void GeneralConfigPane::LoadGUIValues()
if (selection < m_throttler_array_string.size()) if (selection < m_throttler_array_string.size())
m_throttler_choice->SetSelection(selection); m_throttler_choice->SetSelection(selection);
for (size_t i = 0; i < cpu_cores.size(); ++i) for (size_t i = 0; i < m_cpu_cores.size(); ++i)
{ {
if (cpu_cores[i].CPUid == startup_params.iCPUCore) if (m_cpu_cores[i].CPUid == startup_params.iCPUCore)
m_cpu_engine_radiobox->SetSelection(i); m_cpu_engine_radiobox->SetSelection(i);
} }
} }
@ -198,7 +198,7 @@ void GeneralConfigPane::OnThrottlerChoiceChanged(wxCommandEvent& event)
void GeneralConfigPane::OnCPUEngineRadioBoxChanged(wxCommandEvent& event) void GeneralConfigPane::OnCPUEngineRadioBoxChanged(wxCommandEvent& event)
{ {
SConfig::GetInstance().iCPUCore = cpu_cores.at(event.GetSelection()).CPUid; SConfig::GetInstance().iCPUCore = m_cpu_cores.at(event.GetSelection()).CPUid;
} }
void GeneralConfigPane::OnAnalyticsCheckBoxChanged(wxCommandEvent& event) void GeneralConfigPane::OnAnalyticsCheckBoxChanged(wxCommandEvent& event)

2
Source/Core/DolphinWX/Config/GeneralConfigPane.h
View File

@ -24,7 +24,7 @@ private:
int CPUid; int CPUid;
wxString name; wxString name;
}; };
std::vector<CPUCore> cpu_cores; std::vector<CPUCore> m_cpu_cores;
void InitializeGUI(); void InitializeGUI();
void LoadGUIValues(); void LoadGUIValues();
void RefreshGUI(); void RefreshGUI();