Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #155 from Bigpet/wxString_exorcism

Browse Source 
Wx string exorcism fixups
This commit is contained in:
Alexandro Sánchez Bach
2014-04-01 19:40:28 +02:00
parent bc095322c3 02729695ff
commit 2ab8aa173d
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/CPU/CPUDecoder.h
+17 -17
View File
@@ -308,13 +308,13 @@ template<typename TO>
class InstrBase : public InstrCaller<TO>
{
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<TO>()
, 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<TO>
InstrList<count, TO>& m_list;
public:
Instr0(InstrList<count, TO>* list, const wxString& name,
Instr0(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)())
: InstrBase<TO>(name, opcode, 0)
, m_list(*list)
@@ -521,7 +521,7 @@ class Instr1 : public InstrBase<TO>
InstrList<count, TO>& m_list;
public:
Instr1(InstrList<count, TO>* list, const wxString& name,
Instr1(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)(T1),
CodeFieldBase& arg_1)
: InstrBase<TO>(name, opcode, 1)
@@ -560,7 +560,7 @@ class Instr2 : public InstrBase<TO>
InstrList<count, TO>& m_list;
public:
Instr2(InstrList<count, TO>* list, const wxString& name,
Instr2(InstrList<count, TO>* list, const std::string& name,
void (TO::*func)(T1, T2),
CodeFieldBase& arg_1,
CodeFieldBase& arg_2)
@@ -601,7 +601,7 @@ class Instr3 : public InstrBase<TO>
InstrList<count, TO>& m_list;
public:
Instr3(InstrList<count, TO>* list, const wxString& name,
Instr3(InstrList<count, TO>* 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<TO>
InstrList<count, TO>& m_list;
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),
CodeFieldBase& arg_1,
CodeFieldBase& arg_2,
@@ -697,7 +697,7 @@ class Instr5 : public InstrBase<TO>
InstrList<count, TO>& m_list;
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),
CodeFieldBase& arg_1,
CodeFieldBase& arg_2,
@@ -754,7 +754,7 @@ class Instr6 : public InstrBase<TO>
InstrList<count, TO>& m_list;
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),
CodeFieldBase& arg_1,
CodeFieldBase& arg_2,
@@ -810,13 +810,13 @@ public:
};
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);
}
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),
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>
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),
CodeFieldBase& arg_1,
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>
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),
CodeFieldBase& arg_1,
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>
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),
CodeFieldBase& arg_1,
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>
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),
CodeFieldBase& arg_1,
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>
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),
CodeFieldBase& arg_1,
CodeFieldBase& arg_2,
rpcs3/Emu/Cell/PPCThreadManager.cpp
+1 -1
View File
@@ -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);
rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp
+1 -1
View File
@@ -174,7 +174,7 @@ void getSaveDataStat(SaveDataListEntry entry, mem_ptr_t<CellSaveDataStatGet> sta
fileEntry.st_atime_ = 0; // TODO ?
fileEntry.st_mtime_ = 0; // TODO ?
fileEntry.st_ctime_ = 0; // TODO ?
memcpy(fileEntry.fileName, (const char*)dirEntry->name.mb_str(), CELL_SAVEDATA_FILENAME_SIZE);
memcpy(fileEntry.fileName, dirEntry->name.c_str(), CELL_SAVEDATA_FILENAME_SIZE);
fileEntries.push_back(fileEntry);
}
rpcs3/Emu/SysCalls/lv2/SC_Process.cpp
+1 -1
View File
@@ -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<std::string> argv;
std::vector<std::string> env;
rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.h
+2 -2
View File
@@ -60,12 +60,12 @@ struct SpuGroupInfo
{
Array<u32> list;
std::atomic<u32> 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)