RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

replace all instances of wxString with std::string in all cases not

Browse source 
directly involved in either the GUI or other wxWidget classes like wxFile
This commit is contained in:
Peter Tissen 2014-04-01 02:33:55 +02:00
parent b1894ac6cb
commit 8ac226ae69
124 changed files with 1716 additions and 1502 deletions
Download patch file Download diff file Expand all files Collapse all files

52
rpcs3/Emu/Cell/PPUProgramCompiler.h
View file

@ -23,8 +23,8 @@ struct Arg
u32 value;
ArgType type;
Arg(const wxString& _string, const u32 _value = 0, const ArgType _type = ARG_ERR)
: string(_string.ToStdString())
Arg(const std::string& _string, const u32 _value = 0, const ArgType _type = ARG_ERR)
: string(_string)
, value(_value)
, type(_type)
{
@ -38,7 +38,7 @@ struct SectionInfo
Array<u8> code;
u32 section_num;
SectionInfo(const wxString& name);
SectionInfo(const std::string& name);
~SectionInfo();
void SetDataSize(u32 size, u32 align = 0);
@ -67,16 +67,16 @@ class CompilePPUProgram
s32 m_id;
s32 m_addr;
Branch(const wxString& name, s32 pos)
: m_name(name.ToStdString())
Branch(const std::string& name, s32 pos)
: m_name(name)
, m_pos(pos)
, m_id(-1)
, m_addr(-1)
{
}
Branch(const wxString& name, u32 id, u32 addr)
: m_name(name.ToStdString())
Branch(const std::string& name, u32 id, u32 addr)
: m_name(name)
, m_pos(-1)
, m_id(id)
, m_addr(addr)
@ -87,7 +87,7 @@ class CompilePPUProgram
bool m_analyze;
s64 p;
u64 m_line;
const wxString& m_asm;
const std::string& m_asm;
wxTextCtrl* m_asm_list;
wxTextCtrl* m_hex_list;
wxTextCtrl* m_err_list;
@ -97,15 +97,15 @@ class CompilePPUProgram
Array<Branch> m_branches;
s32 m_branch_pos;
u32 m_text_addr;
wxString m_file_path;
std::string m_file_path;
struct SpData
{
std::string m_data;
u32 m_addr;
SpData(const wxString& data, u32 addr)
: m_data(data.ToStdString())
SpData(const std::string& data, u32 addr)
: m_data(data)
, m_addr(addr)
{
}
@ -117,8 +117,8 @@ class CompilePPUProgram
public:
CompilePPUProgram(
const wxString& asm_,
const wxString& file_path = wxEmptyString,
const std::string& asm_,
const std::string& file_path = "",
wxTextCtrl* asm_list = nullptr,
wxTextCtrl* hex_list = nullptr,
wxTextCtrl* err_list = nullptr,
@ -131,8 +131,8 @@ protected:
bool IsEnd() const;
bool IsEndLn(const char c) const;
void WriteHex(const wxString& text);
void WriteError(const wxString& error);
void WriteHex(const std::string& text);
void WriteError(const std::string& error);
char NextChar();
void NextLn();
@ -141,21 +141,21 @@ protected:
void FirstChar();
void PrevArg();
bool GetOp(wxString& result);
int GetArg(wxString& result, bool func = false);
bool GetOp(std::string& result);
int GetArg(std::string& result, bool func = false);
bool CheckEnd(bool show_err = true);
void DetectArgInfo(Arg& arg);
void LoadArgs();
u32 GetBranchValue(const wxString& branch);
u32 GetBranchValue(const std::string& branch);
bool SetNextArgType(u32 types, bool show_err = true);
bool SetNextArgBranch(u8 aa, bool show_err = true);
public:
static bool IsBranchOp(const wxString& op);
static bool IsFuncOp(const wxString& op);
static bool IsBranchOp(const std::string& op);
static bool IsFuncOp(const std::string& op);
enum SP_TYPE
{
@ -177,15 +177,15 @@ public:
SP_NOR,
};
static SP_TYPE GetSpType(const wxString& op);
static wxString GetSpStyle(const SP_TYPE sp);
static SP_TYPE GetSpType(const std::string& op);
static std::string GetSpStyle(const SP_TYPE sp);
static bool IsSpOp(const wxString& op);
static bool IsSpOp(const std::string& op);
protected:
Branch& GetBranch(const wxString& name);
void SetSp(const wxString& name, u32 addr, bool create);
void LoadSp(const wxString& op, Elf64_Shdr& s_opd);
Branch& GetBranch(const std::string& name);
void SetSp(const std::string& name, u32 addr, bool create);
void LoadSp(const std::string& op, Elf64_Shdr& s_opd);
public:
void Compile();