Move all core types into namespaces (#1886)

* Reorganize namespaces

- Most types are now moved into the `melonDS` namespace
- Only good chance to do this for a while, since a big refactor is next

* Fix the build
This commit is contained in:
Jesse Talavera-Greenberg
2023-11-25 12:32:09 -05:00
committed by GitHub
parent 651b0f680c
commit 346dd4006e
178 changed files with 529 additions and 268 deletions

View File

@ -46,10 +46,10 @@ class TitleManagerDialog : public QDialog
Q_OBJECT
public:
explicit TitleManagerDialog(QWidget* parent, DSi_NAND::NANDImage& image);
explicit TitleManagerDialog(QWidget* parent, melonDS::DSi_NAND::NANDImage& image);
~TitleManagerDialog();
static std::unique_ptr<DSi_NAND::NANDImage> nand;
static std::unique_ptr<melonDS::DSi_NAND::NANDImage> nand;
static bool openNAND();
static void closeNAND();
@ -94,17 +94,17 @@ private slots:
void onExportTitleData();
private:
DSi_NAND::NANDMount nandmount;
melonDS::DSi_NAND::NANDMount nandmount;
Ui::TitleManagerDialog* ui;
QString importAppPath;
DSi_TMD::TitleMetadata importTmdData;
melonDS::DSi_TMD::TitleMetadata importTmdData;
bool importReadOnly;
QAction* actImportTitleData[3];
QAction* actExportTitleData[3];
void createTitleItem(u32 category, u32 titleid);
void createTitleItem(melonDS::u32 category, melonDS::u32 titleid);
};
class TitleImportDialog : public QDialog
@ -112,7 +112,7 @@ class TitleImportDialog : public QDialog
Q_OBJECT
public:
explicit TitleImportDialog(QWidget* parent, QString& apppath, const DSi_TMD::TitleMetadata* tmd, bool& readonly, DSi_NAND::NANDMount& nand);
explicit TitleImportDialog(QWidget* parent, QString& apppath, const melonDS::DSi_TMD::TitleMetadata* tmd, bool& readonly, melonDS::DSi_NAND::NANDMount& nand);
~TitleImportDialog();
private slots:
@ -125,7 +125,7 @@ private slots:
private:
Ui::TitleImportDialog* ui;
DSi_NAND::NANDMount& nandmount;
melonDS::DSi_NAND::NANDMount& nandmount;
QButtonGroup* grpTmdSource;
@ -133,10 +133,10 @@ private:
QNetworkReply* netreply;
QString& appPath;
const DSi_TMD::TitleMetadata* tmdData;
const melonDS::DSi_TMD::TitleMetadata* tmdData;
bool& readOnly;
u32 titleid[2];
melonDS::u32 titleid[2];
};
#endif // TITLEMANAGERDIALOG_H