mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 04:38:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #164 from lioncash/cstr-cull

Browse source 
Kill off some usages of c_str.
This commit is contained in:
Pierre Bourdon 2014-03-15 00:57:56 +01:00
commit 8d679e76d2
170 changed files with 812 additions and 704 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/Core/DolphinWX/ISOProperties.cpp
View file

@ -735,11 +735,11 @@ void CISOProperties::OnExtractFile(wxCommandEvent& WXUNUSED (event))
{
int partitionNum = wxAtoi(File.Mid(File.find_first_of("/") - 1, 1));
File.Remove(0, File.find_first_of("/") +1); // Remove "Partition x/"
WiiDisc.at(partitionNum).FileSystem->ExportFile(WxStrToStr(File).c_str(), WxStrToStr(Path).c_str());
WiiDisc.at(partitionNum).FileSystem->ExportFile(WxStrToStr(File), WxStrToStr(Path));
}
else
{
pFileSystem->ExportFile(WxStrToStr(File).c_str(), WxStrToStr(Path).c_str());
pFileSystem->ExportFile(WxStrToStr(File), WxStrToStr(Path));
}
}
@ -915,11 +915,11 @@ void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event)
bool ret = false;
if (event.GetId() == IDM_EXTRACTAPPLOADER)
{
ret = FS->ExportApploader(WxStrToStr(Path).c_str());
ret = FS->ExportApploader(WxStrToStr(Path));
}
else if (event.GetId() == IDM_EXTRACTDOL)
{
ret = FS->ExportDOL(WxStrToStr(Path).c_str());
ret = FS->ExportDOL(WxStrToStr(Path));
}
if (!ret)
@ -1135,7 +1135,7 @@ bool CISOProperties::SaveGameConfig()
ActionReplayList_Save();
Gecko::SaveCodes(GameIniLocal, m_geckocode_panel->GetCodes());
bool success = GameIniLocal.Save(GameIniFileLocal.c_str());
bool success = GameIniLocal.Save(GameIniFileLocal);
// If the resulting file is empty, delete it. Kind of a hack, but meh.
if (success && File::GetSize(GameIniFileLocal) == 0)