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

MemcardManager: Get rid of prefixed double-underscores from an identifier 

Identifiers with prefixed double-underscores are reserved by the C++
standard.
This commit is contained in:
Lioncash 2017-02-03 11:30:36 -05:00
parent 9d523f52f2
commit 5ce82583f8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinWX/MemcardManager.cpp
View File

@ -809,7 +809,7 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event)
popupMenu.Append(ID_SAVEEXPORT_A + slot, _("Export Save"));
popupMenu.Append(ID_EXPORTALL_A + slot, _("Export all saves"));
popupMenu.FindItem(ID_COPYFROM_A + slot)->Enable(__mcmSettings.twoCardsLoaded);
popupMenu.FindItem(ID_COPYFROM_A + slot)->Enable(mgr_settings.twoCardsLoaded);
popupMenu.AppendSeparator();
@ -820,9 +820,9 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event)
wxString::Format(_("Set as default Memory Card %c"), 'A' + slot));
popupMenu.AppendCheckItem(ID_USEPAGES, _("Enable pages"));
popupMenu.FindItem(ID_PREVPAGE_A + slot)->Enable(prevPage && __mcmSettings.usePages);
popupMenu.FindItem(ID_NEXTPAGE_A + slot)->Enable(nextPage && __mcmSettings.usePages);
popupMenu.FindItem(ID_USEPAGES)->Check(__mcmSettings.usePages);
popupMenu.FindItem(ID_PREVPAGE_A + slot)->Enable(prevPage && mgr_settings.usePages);
popupMenu.FindItem(ID_NEXTPAGE_A + slot)->Enable(nextPage && mgr_settings.usePages);
popupMenu.FindItem(ID_USEPAGES)->Check(mgr_settings.usePages);
popupMenu.AppendSeparator();
@ -836,7 +836,7 @@ void CMemcardManager::CMemcardListCtrl::OnRightClick(wxMouseEvent& event)
// for (int i = COLUMN_BANNER; i <= COLUMN_FIRSTBLOCK; i++)
for (int i = COLUMN_TITLE; i <= COLUMN_FIRSTBLOCK; i++)
{
popupMenu.FindItem(i)->Check(__mcmSettings.column[i]);
popupMenu.FindItem(i)->Check(mgr_settings.column[i]);
}
}
PopupMenu(&popupMenu);

8
Source/Core/DolphinWX/MemcardManager.h
View File

@ -108,7 +108,7 @@ private:
bool LoadSettings();
bool SaveSettings();
struct _mcmSettings
struct ManagerSettings
{
bool twoCardsLoaded;
bool usePages;
@ -119,13 +119,13 @@ private:
{
public:
CMemcardListCtrl(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
long style, _mcmSettings& _mcmSetngs)
: wxListCtrl(parent, id, pos, size, style), __mcmSettings(_mcmSetngs)
long style, ManagerSettings& manager_settings)
: wxListCtrl(parent, id, pos, size, style), mgr_settings(manager_settings)
{
Bind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this);
}
~CMemcardListCtrl() { Unbind(wxEVT_RIGHT_DOWN, &CMemcardListCtrl::OnRightClick, this); }
_mcmSettings& __mcmSettings;
ManagerSettings& mgr_settings;
bool prevPage;
bool nextPage;