diff --git a/rpcs3/Emu/CPU/CPUDecoder.h b/rpcs3/Emu/CPU/CPUDecoder.h index f1c1d3501a..c686863be8 100644 --- a/rpcs3/Emu/CPU/CPUDecoder.h +++ b/rpcs3/Emu/CPU/CPUDecoder.h @@ -308,13 +308,13 @@ template class InstrBase : public InstrCaller { protected: - wxString m_name; + std::string m_name; const u32 m_opcode; CodeFieldBase** m_args; const uint m_args_count; public: - InstrBase(const wxString& name, int opcode, uint args_count) + InstrBase(const std::string& name, int opcode, uint args_count) : InstrCaller() , m_name(name) , m_opcode(opcode) @@ -324,7 +324,7 @@ public: m_name.MakeLower().Replace("_", "."); } - __forceinline const wxString& GetName() const + __forceinline const std::string& GetName() const { return m_name; } @@ -485,7 +485,7 @@ class Instr0 : public InstrBase InstrList& m_list; public: - Instr0(InstrList* list, const wxString& name, + Instr0(InstrList* list, const std::string& name, void (TO::*func)()) : InstrBase(name, opcode, 0) , m_list(*list) @@ -521,7 +521,7 @@ class Instr1 : public InstrBase InstrList& m_list; public: - Instr1(InstrList* list, const wxString& name, + Instr1(InstrList* list, const std::string& name, void (TO::*func)(T1), CodeFieldBase& arg_1) : InstrBase(name, opcode, 1) @@ -560,7 +560,7 @@ class Instr2 : public InstrBase InstrList& m_list; public: - Instr2(InstrList* list, const wxString& name, + Instr2(InstrList* list, const std::string& name, void (TO::*func)(T1, T2), CodeFieldBase& arg_1, CodeFieldBase& arg_2) @@ -601,7 +601,7 @@ class Instr3 : public InstrBase InstrList& m_list; public: - Instr3(InstrList* list, const wxString& name, + Instr3(InstrList* list, const std::string& name, void (TO::*func)(T1, T2, T3), CodeFieldBase& arg_1, CodeFieldBase& arg_2, @@ -644,7 +644,7 @@ class Instr4 : public InstrBase InstrList& m_list; public: - Instr4(InstrList* list, const wxString& name, + Instr4(InstrList* list, const std::string& name, void (TO::*func)(T1, T2, T3, T4), CodeFieldBase& arg_1, CodeFieldBase& arg_2, @@ -697,7 +697,7 @@ class Instr5 : public InstrBase InstrList& m_list; public: - Instr5(InstrList* list, const wxString& name, + Instr5(InstrList* list, const std::string& name, void (TO::*func)(T1, T2, T3, T4, T5), CodeFieldBase& arg_1, CodeFieldBase& arg_2, @@ -754,7 +754,7 @@ class Instr6 : public InstrBase InstrList& m_list; public: - Instr6(InstrList* list, const wxString& name, + Instr6(InstrList* list, const std::string& name, void (TO::*func)(T1, T2, T3, T4, T5, T6), CodeFieldBase& arg_1, CodeFieldBase& arg_2, @@ -810,13 +810,13 @@ public: }; template -static Instr0& make_instr(InstrList* list, const wxString& name, void (TO::*func)()) +static Instr0& make_instr(InstrList* list, const std::string& name, void (TO::*func)()) { return *new Instr0(list, name, func); } template -static Instr1& make_instr(InstrList* list, const wxString& name, +static Instr1& make_instr(InstrList* list, const std::string& name, void (TO::*func)(T1), CodeFieldBase& arg_1) { @@ -824,7 +824,7 @@ static Instr1& make_instr(InstrList* list, con } template -static Instr2& make_instr(InstrList* list, const wxString& name, +static Instr2& make_instr(InstrList* list, const std::string& name, void (TO::*func)(T1, T2), CodeFieldBase& arg_1, CodeFieldBase& arg_2) @@ -833,7 +833,7 @@ static Instr2& make_instr(InstrList* list, } template -static Instr3& make_instr(InstrList* list, const wxString& name, +static Instr3& make_instr(InstrList* list, const std::string& name, void (TO::*func)(T1, T2, T3), CodeFieldBase& arg_1, CodeFieldBase& arg_2, @@ -843,7 +843,7 @@ static Instr3& make_instr(InstrList* l } template -static Instr4& make_instr(InstrList* list, const wxString& name, +static Instr4& make_instr(InstrList* list, const std::string& name, void (TO::*func)(T1, T2, T3, T4), CodeFieldBase& arg_1, CodeFieldBase& arg_2, @@ -854,7 +854,7 @@ static Instr4& make_instr(InstrList -static Instr5& make_instr(InstrList* list, const wxString& name, +static Instr5& make_instr(InstrList* list, const std::string& name, void (TO::*func)(T1, T2, T3, T4, T5), CodeFieldBase& arg_1, CodeFieldBase& arg_2, @@ -866,7 +866,7 @@ static Instr5& make_instr(InstrList -static Instr6& make_instr(InstrList* list, const wxString& name, +static Instr6& make_instr(InstrList* list, const std::string& name, void (TO::*func)(T1, T2, T3, T4, T5, T6), CodeFieldBase& arg_1, CodeFieldBase& arg_2, diff --git a/rpcs3/Emu/Cell/PPCThreadManager.cpp b/rpcs3/Emu/Cell/PPCThreadManager.cpp index 52e8b83ae7..c0d5bafce5 100644 --- a/rpcs3/Emu/Cell/PPCThreadManager.cpp +++ b/rpcs3/Emu/Cell/PPCThreadManager.cpp @@ -34,7 +34,7 @@ PPCThread& PPCThreadManager::AddThread(PPCThreadType type) 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); wxGetApp().SendDbgCommand(DID_CREATE_THREAD, new_thread); diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Process.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Process.cpp index 0e6969864c..4da7dbf2ab 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Process.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Process.cpp @@ -117,7 +117,7 @@ void sys_game_process_exitspawn2( sc_p.Warning("prio: %d", prio); sc_p.Warning("flags: %d", flags); - wxString path = Memory.ReadString(path_addr); + std::string path = Memory.ReadString(path_addr); std::vector argv; std::vector env; diff --git a/rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.h b/rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.h index 1721b9c232..3c7d320ed7 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.h +++ b/rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.h @@ -60,12 +60,12 @@ struct SpuGroupInfo { Array list; std::atomic lock; - wxString m_name; + std::string m_name; int m_prio; int m_type; 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_prio(prio) , m_type(type)