diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp index 88a660c739..ab66a346d4 100644 --- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp +++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp @@ -176,7 +176,6 @@ bool CBannerLoaderWii::GetName(std::vector& _rNames) { temp.push_back(Common::swap16(pBanner->m_Comment[0][i])); } - temp.push_back('\0'); _rNames.push_back(temp); return true; } @@ -220,8 +219,7 @@ bool CBannerLoaderWii::GetDescription(std::wstring& _rDescription) std::wstring description; for (int i = 0; i < WII_BANNER_COMMENT_SIZE; ++i) description.push_back(Common::swap16(pBanner->m_Comment[1][i])); - - description.push_back('\0'); + _rDescription = description; return true; } diff --git a/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp b/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp index 863d09436c..ca275ba66a 100644 --- a/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/DSPRegisterView.cpp @@ -27,10 +27,10 @@ wxString CDSPRegTable::GetValue(int row, int col) { case 0: return wxString::FromAscii(pdregname(row)); case 1: return wxString::Format(wxT("0x%04x"), DSPCore_ReadRegister(row)); - default: return wxString::FromAscii(""); + default: return wxEmptyString; } } - return wxString::FromAscii(""); + return wxEmptyString; } void CDSPRegTable::SetValue(int, int, const wxString &) diff --git a/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp b/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp index ecd706cf9a..c4a30fd522 100644 --- a/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/RegisterView.cpp @@ -56,18 +56,18 @@ wxString CRegTable::GetValue(int row, int col) case 2: return wxString::FromAscii(GetFPRName(row)); case 3: return wxString::Format(wxT("%016llx"), riPS0(row)); case 4: return wxString::Format(wxT("%016llx"), riPS1(row)); - default: return wxString::FromAscii(""); + default: return wxEmptyString; } } else { if (row - 32 < NUM_SPECIALS) { switch (col) { case 0: return wxString::FromAscii(special_reg_names[row - 32]); case 1: return wxString::Format(wxT("%08x"), GetSpecialRegValue(row - 32)); - default: return wxString::FromAscii(""); + default: return wxEmptyString; } } } - return wxString::FromAscii(""); + return wxEmptyString; } static void SetSpecialRegValue(int reg, u32 value) { diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index eb510fd37e..9dbbf656e9 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -1179,7 +1179,7 @@ void CGameListCtrl::CompressSelection(bool _compress) if (wxFileExists(wxString::FromAscii(OutputFileName.c_str())) && wxMessageBox( wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"), - OutputFileName.c_str()), + wxString(OutputFileName.c_str(), *wxConvCurrent).c_str()), _("Confirm File Overwrite"), wxYES_NO) == wxNO) continue; @@ -1207,7 +1207,7 @@ void CGameListCtrl::CompressSelection(bool _compress) if (wxFileExists(wxString::FromAscii(OutputFileName.c_str())) && wxMessageBox( wxString::Format(_("The file %s already exists.\nDo you wish to replace it?"), - OutputFileName.c_str()), + wxString(OutputFileName.c_str(), *wxConvCurrent).c_str()), _("Confirm File Overwrite"), wxYES_NO) == wxNO) continue;