mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-06 09:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove some wxString references I missed

Browse Source
This commit is contained in:
Peter Tissen 2014-04-01 19:01:42 +02:00
parent bcb9ad94c1
commit 02729695ff
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
rpcs3/Emu/CPU/CPUDecoder.h
View File

@ -308,13 +308,13 @@ template<typename TO>
class InstrBase : public InstrCaller<TO> class InstrBase : public InstrCaller<TO>
{ {
protected: protected:
wxString m_name; std::string m_name;
const u32 m_opcode; const u32 m_opcode;
CodeFieldBase** m_args; CodeFieldBase** m_args;
const uint m_args_count; const uint m_args_count;
public: public:
InstrBase(const wxString& name, int opcode, uint args_count) InstrBase(const std::string& name, int opcode, uint args_count)
: InstrCaller<TO>() : InstrCaller<TO>()
, m_name(name) , m_name(name)
, m_opcode(opcode) , m_opcode(opcode)
@ -324,7 +324,7 @@ public:
m_name.MakeLower().Replace("_", "."); m_name.MakeLower().Replace("_", ".");
} }
__forceinline const wxString& GetName() const __forceinline const std::string& GetName() const
{ {
return m_name; return m_name;
} }
@ -485,7 +485,7 @@ class Instr0 : public InstrBase<TO>
InstrList<count, TO>& m_list; InstrList<count, TO>& m_list;
public: public:
Instr0(InstrList<count, TO>* list, const wxString& name, Instr0(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)()) void (TO::*func)())
: InstrBase<TO>(name, opcode, 0) : InstrBase<TO>(name, opcode, 0)
, m_list(*list) , m_list(*list)
@ -521,7 +521,7 @@ class Instr1 : public InstrBase<TO>
InstrList<count, TO>& m_list; InstrList<count, TO>& m_list;
public: public:
Instr1(InstrList<count, TO>* list, const wxString& name, Instr1(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)(T1), void (TO::*func)(T1),
CodeFieldBase& arg_1) CodeFieldBase& arg_1)
: InstrBase<TO>(name, opcode, 1) : InstrBase<TO>(name, opcode, 1)
@ -560,7 +560,7 @@ class Instr2 : public InstrBase<TO>
InstrList<count, TO>& m_list; InstrList<count, TO>& m_list;
public: public:
Instr2(InstrList<count, TO>* list, const wxString& name, Instr2(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)(T1, T2), void (TO::*func)(T1, T2),
CodeFieldBase& arg_1, CodeFieldBase& arg_1,
CodeFieldBase& arg_2) CodeFieldBase& arg_2)
@ -601,7 +601,7 @@ class Instr3 : public InstrBase<TO>
InstrList<count, TO>& m_list; InstrList<count, TO>& m_list;
public: public:
Instr3(InstrList<count, TO>* list, const wxString& name, Instr3(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)(T1, T2, T3), void (TO::*func)(T1, T2, T3),
CodeFieldBase& arg_1, CodeFieldBase& arg_1,
CodeFieldBase& arg_2, CodeFieldBase& arg_2,
@ -644,7 +644,7 @@ class Instr4 : public InstrBase<TO>
InstrList<count, TO>& m_list; InstrList<count, TO>& m_list;
public: public:
Instr4(InstrList<count, TO>* list, const wxString& name, Instr4(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)(T1, T2, T3, T4), void (TO::*func)(T1, T2, T3, T4),
CodeFieldBase& arg_1, CodeFieldBase& arg_1,
CodeFieldBase& arg_2, CodeFieldBase& arg_2,
@ -697,7 +697,7 @@ class Instr5 : public InstrBase<TO>
InstrList<count, TO>& m_list; InstrList<count, TO>& m_list;
public: public:
Instr5(InstrList<count, TO>* list, const wxString& name, Instr5(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)(T1, T2, T3, T4, T5), void (TO::*func)(T1, T2, T3, T4, T5),
CodeFieldBase& arg_1, CodeFieldBase& arg_1,
CodeFieldBase& arg_2, CodeFieldBase& arg_2,
@ -754,7 +754,7 @@ class Instr6 : public InstrBase<TO>
InstrList<count, TO>& m_list; InstrList<count, TO>& m_list;
public: public:
Instr6(InstrList<count, TO>* list, const wxString& name, Instr6(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)(T1, T2, T3, T4, T5, T6), void (TO::*func)(T1, T2, T3, T4, T5, T6),
CodeFieldBase& arg_1, CodeFieldBase& arg_1,
CodeFieldBase& arg_2, CodeFieldBase& arg_2,
@ -810,13 +810,13 @@ public:
}; };
template<int opcode, typename TO, int count> template<int opcode, typename TO, int count>
static Instr0<TO, opcode, count>& make_instr(InstrList<count, TO>* list, const wxString& name, void (TO::*func)()) static Instr0<TO, opcode, count>& make_instr(InstrList<count, TO>* list, const std::string& name, void (TO::*func)())
{ {
return *new Instr0<TO, opcode, count>(list, name, func); return *new Instr0<TO, opcode, count>(list, name, func);
} }
template<int opcode, typename TO, int count, typename T1> template<int opcode, typename TO, int count, typename T1>
static Instr1<TO, opcode, count, T1>& make_instr(InstrList<count, TO>* list, const wxString& name, static Instr1<TO, opcode, count, T1>& make_instr(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)(T1), void (TO::*func)(T1),
CodeFieldBase& arg_1) CodeFieldBase& arg_1)
{ {
@ -824,7 +824,7 @@ static Instr1<TO, opcode, count, T1>& make_instr(InstrList<count, TO>* list, con
} }
template<int opcode, typename TO, int count, typename T1, typename T2> template<int opcode, typename TO, int count, typename T1, typename T2>
static Instr2<TO, opcode, count, T1, T2>& make_instr(InstrList<count, TO>* list, const wxString& name, static Instr2<TO, opcode, count, T1, T2>& make_instr(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)(T1, T2), void (TO::*func)(T1, T2),
CodeFieldBase& arg_1, CodeFieldBase& arg_1,
CodeFieldBase& arg_2) CodeFieldBase& arg_2)
@ -833,7 +833,7 @@ static Instr2<TO, opcode, count, T1, T2>& make_instr(InstrList<count, TO>* list,
} }
template<int opcode, typename TO, int count, typename T1, typename T2, typename T3> template<int opcode, typename TO, int count, typename T1, typename T2, typename T3>
static Instr3<TO, opcode, count, T1, T2, T3>& make_instr(InstrList<count, TO>* list, const wxString& name, static Instr3<TO, opcode, count, T1, T2, T3>& make_instr(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)(T1, T2, T3), void (TO::*func)(T1, T2, T3),
CodeFieldBase& arg_1, CodeFieldBase& arg_1,
CodeFieldBase& arg_2, CodeFieldBase& arg_2,
@ -843,7 +843,7 @@ static Instr3<TO, opcode, count, T1, T2, T3>& make_instr(InstrList<count, TO>* l
} }
template<int opcode, typename TO, int count, typename T1, typename T2, typename T3, typename T4> template<int opcode, typename TO, int count, typename T1, typename T2, typename T3, typename T4>
static Instr4<TO, opcode, count, T1, T2, T3, T4>& make_instr(InstrList<count, TO>* list, const wxString& name, static Instr4<TO, opcode, count, T1, T2, T3, T4>& make_instr(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)(T1, T2, T3, T4), void (TO::*func)(T1, T2, T3, T4),
CodeFieldBase& arg_1, CodeFieldBase& arg_1,
CodeFieldBase& arg_2, CodeFieldBase& arg_2,
@ -854,7 +854,7 @@ static Instr4<TO, opcode, count, T1, T2, T3, T4>& make_instr(InstrList<count, TO
} }
template<int opcode, typename TO, int count, typename T1, typename T2, typename T3, typename T4, typename T5> template<int opcode, typename TO, int count, typename T1, typename T2, typename T3, typename T4, typename T5>
static Instr5<TO, opcode, count, T1, T2, T3, T4, T5>& make_instr(InstrList<count, TO>* list, const wxString& name, static Instr5<TO, opcode, count, T1, T2, T3, T4, T5>& make_instr(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)(T1, T2, T3, T4, T5), void (TO::*func)(T1, T2, T3, T4, T5),
CodeFieldBase& arg_1, CodeFieldBase& arg_1,
CodeFieldBase& arg_2, CodeFieldBase& arg_2,
@ -866,7 +866,7 @@ static Instr5<TO, opcode, count, T1, T2, T3, T4, T5>& make_instr(InstrList<count
} }
template<int opcode, typename TO, int count, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6> template<int opcode, typename TO, int count, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
static Instr6<TO, opcode, count, T1, T2, T3, T4, T5, T6>& make_instr(InstrList<count, TO>* list, const wxString& name, static Instr6<TO, opcode, count, T1, T2, T3, T4, T5, T6>& make_instr(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)(T1, T2, T3, T4, T5, T6), void (TO::*func)(T1, T2, T3, T4, T5, T6),
CodeFieldBase& arg_1, CodeFieldBase& arg_1,
CodeFieldBase& arg_2, CodeFieldBase& arg_2,

2
rpcs3/Emu/Cell/PPCThreadManager.cpp
View File

@ -34,7 +34,7 @@ PPCThread& PPCThreadManager::AddThread(PPCThreadType type)
default: assert(0); default: assert(0);
} }
new_thread->SetId(Emu.GetIdManager().GetNewID(wxString::Format("%s Thread", name).ToStdString(), new_thread)); new_thread->SetId(Emu.GetIdManager().GetNewID(fmt::Format("%s Thread", name), new_thread));
m_threads.Add(new_thread); m_threads.Add(new_thread);
wxGetApp().SendDbgCommand(DID_CREATE_THREAD, new_thread); wxGetApp().SendDbgCommand(DID_CREATE_THREAD, new_thread);

2
rpcs3/Emu/SysCalls/lv2/SC_Process.cpp
View File

@ -117,7 +117,7 @@ void sys_game_process_exitspawn2(
sc_p.Warning("prio: %d", prio); sc_p.Warning("prio: %d", prio);
sc_p.Warning("flags: %d", flags); sc_p.Warning("flags: %d", flags);
wxString path = Memory.ReadString(path_addr); std::string path = Memory.ReadString(path_addr);
std::vector<std::string> argv; std::vector<std::string> argv;
std::vector<std::string> env; std::vector<std::string> env;

4
rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.h
View File

@ -60,12 +60,12 @@ struct SpuGroupInfo
{ {
Array<u32> list; Array<u32> list;
std::atomic<u32> lock; std::atomic<u32> lock;
wxString m_name; std::string m_name;
int m_prio; int m_prio;
int m_type; int m_type;
int m_ct; int m_ct;
SpuGroupInfo(wxString name, u32 num, int prio, int type, u32 ct) SpuGroupInfo(const std::string& name, u32 num, int prio, int type, u32 ct)
: m_name(name) : m_name(name)
, m_prio(prio) , m_prio(prio)
, m_type(type) , m_type(type)