From 9d523f52f2cf8e1f2732a929d889631180df1c0b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 3 Feb 2017 11:15:07 -0500 Subject: [PATCH] MemcardManager: Convert C arrays to std::array --- Source/Core/DolphinWX/MemcardManager.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Source/Core/DolphinWX/MemcardManager.h b/Source/Core/DolphinWX/MemcardManager.h index 3a855f9668..da5aa23f44 100644 --- a/Source/Core/DolphinWX/MemcardManager.h +++ b/Source/Core/DolphinWX/MemcardManager.h @@ -28,23 +28,23 @@ public: private: DECLARE_EVENT_TABLE(); - int page[2]; + std::array page; int itemsPerPage; int maxPages; - std::string DefaultMemcard[2]; + std::array DefaultMemcard; std::string DefaultIOPath; IniFile MemcardManagerIni; IniFile::Section* iniMemcardSection; - wxButton* m_CopyFrom[2]; - wxButton* m_SaveImport[2]; - wxButton* m_SaveExport[2]; - wxButton* m_Delete[2]; - wxButton* m_NextPage[2]; - wxButton* m_PrevPage[2]; + std::array m_CopyFrom; + std::array m_SaveImport; + std::array m_SaveExport; + std::array m_Delete; + std::array m_NextPage; + std::array m_PrevPage; wxButton* m_ConvertToGci; - wxFilePickerCtrl* m_MemcardPath[2]; - wxStaticText* t_Status[2]; + std::array m_MemcardPath; + std::array t_Status; enum { @@ -112,7 +112,7 @@ private: { bool twoCardsLoaded; bool usePages; - bool column[NUMBER_OF_COLUMN + 1]; + std::array column; } mcmSettings; class CMemcardListCtrl : public wxListCtrl @@ -134,5 +134,5 @@ private: }; wxSize m_image_list_size; - CMemcardListCtrl* m_MemcardList[2]; + std::array m_MemcardList; };