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

GCMemcard: Move from global namespace into a Memcard namespace.

Browse Source
This commit is contained in:
Admiral H. Curtiss
2020-06-15 02:09:37 +02:00
parent 2e1bfe073c
commit 914ebdf0dd
14 changed files with 117 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinQt/GCMemcardManager.h
View File

@ -13,8 +13,11 @@
#include "Common/CommonTypes.h"
namespace Memcard
{
class GCMemcard;
class GCMemcardErrorCode;
} // namespace Memcard
class QDialogButtonBox;
class QGroupBox;
@ -33,7 +36,7 @@ public:
explicit GCMemcardManager(QWidget* parent = nullptr);
~GCMemcardManager();
static QString GetErrorMessagesForErrorCode(const GCMemcardErrorCode& code);
static QString GetErrorMessagesForErrorCode(const Memcard::GCMemcardErrorCode& code);
private:
struct IconAnimationData;
@ -73,7 +76,7 @@ private:
// Slots
static constexpr int SLOT_COUNT = 2;
std::array<std::vector<IconAnimationData>, SLOT_COUNT> m_slot_active_icons;
std::array<std::unique_ptr<GCMemcard>, SLOT_COUNT> m_slot_memcard;
std::array<std::unique_ptr<Memcard::GCMemcard>, SLOT_COUNT> m_slot_memcard;
std::array<QGroupBox*, SLOT_COUNT> m_slot_group;
std::array<QLineEdit*, SLOT_COUNT> m_slot_file_edit;
std::array<QPushButton*, SLOT_COUNT> m_slot_open_button;