mirror of
https://github.com/melonDS-emu/melonDS.git
synced 2025-07-26 15:50:00 -06:00
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:

committed by
GitHub

parent
651b0f680c
commit
346dd4006e
@ -53,22 +53,22 @@ enum
|
||||
ramInfo_Previous
|
||||
};
|
||||
|
||||
s32 GetMainRAMValue(const u32& addr, const ramInfo_ByteType& byteType);
|
||||
melonDS::s32 GetMainRAMValue(const melonDS::u32& addr, const ramInfo_ByteType& byteType);
|
||||
|
||||
struct ramInfo_RowData
|
||||
{
|
||||
u32 Address;
|
||||
s32 Value;
|
||||
s32 Previous;
|
||||
melonDS::u32 Address;
|
||||
melonDS::s32 Value;
|
||||
melonDS::s32 Previous;
|
||||
|
||||
void Update(const ramInfo_ByteType& byteType)
|
||||
{
|
||||
Value = GetMainRAMValue(Address, byteType);
|
||||
}
|
||||
|
||||
void SetValue(const s32& value)
|
||||
void SetValue(const melonDS::s32& value)
|
||||
{
|
||||
NDS::MainRAM[Address&NDS::MainRAMMask] = (u32)value;
|
||||
melonDS::NDS::MainRAM[Address&melonDS::NDS::MainRAMMask] = (melonDS::u32)value;
|
||||
Value = value;
|
||||
}
|
||||
};
|
||||
@ -99,7 +99,7 @@ public:
|
||||
currentDlg = nullptr;
|
||||
}
|
||||
|
||||
s32 SearchValue = 0;
|
||||
melonDS::s32 SearchValue = 0;
|
||||
|
||||
void ClearTableContents();
|
||||
|
||||
@ -115,7 +115,7 @@ private slots:
|
||||
|
||||
void OnSearchFinished();
|
||||
void ShowRowsInTable();
|
||||
void SetProgressbarValue(const u32& value);
|
||||
void SetProgressbarValue(const melonDS::u32& value);
|
||||
|
||||
private:
|
||||
Ui::RAMInfoDialog* ui;
|
||||
@ -132,7 +132,7 @@ public:
|
||||
explicit RAMSearchThread(RAMInfoDialog* dialog);
|
||||
~RAMSearchThread() override;
|
||||
|
||||
void Start(const s32& searchValue, const ramInfoSTh_SearchMode& searchMode = ramInfoSTh_Default);
|
||||
void Start(const melonDS::s32& searchValue, const ramInfoSTh_SearchMode& searchMode = ramInfoSTh_Default);
|
||||
void Start(const ramInfoSTh_SearchMode& searchMode);
|
||||
|
||||
void SetSearchByteType(const ramInfo_ByteType& bytetype);
|
||||
@ -148,14 +148,14 @@ private:
|
||||
bool SearchRunning = false;
|
||||
|
||||
ramInfoSTh_SearchMode SearchMode;
|
||||
s32 SearchValue;
|
||||
melonDS::s32 SearchValue;
|
||||
ramInfo_ByteType SearchByteType = ramInfo_OneByte;
|
||||
std::vector<ramInfo_RowData>* RowDataVector = nullptr;
|
||||
|
||||
void ClearTableContents();
|
||||
|
||||
signals:
|
||||
void SetProgressbarValue(const u32& value);
|
||||
void SetProgressbarValue(const melonDS::u32& value);
|
||||
};
|
||||
|
||||
#endif // RAMINFODIALOG_H
|
||||
|
Reference in New Issue
Block a user