mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Use std::to_wstring rather than wxString::Format("%d", ...)

Browse source 
std::to_wstring is significantly faster and is a bit shorter.
This commit is contained in:
Thomas Goyne 2013-09-18 08:31:26 -07:00
parent 64ecd29169
commit c62ebf7e8b
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
aegisub/src/base_grid.cpp
View file

@ -577,11 +577,11 @@ void BaseGrid::DrawImage(wxDC &dc, bool paint_columns[]) {
} }
void BaseGrid::GetRowStrings(int row, AssDialogue *line, bool *paint_columns, wxString *strings, bool replace, wxString const& rep_char) const { void BaseGrid::GetRowStrings(int row, AssDialogue *line, bool *paint_columns, wxString *strings, bool replace, wxString const& rep_char) const {
if (paint_columns[0]) strings[0] = wxString::Format("%d", row + 1); if (paint_columns[0]) strings[0] = std::to_wstring(row + 1);
if (paint_columns[1]) strings[1] = wxString::Format("%d", line->Layer); if (paint_columns[1]) strings[1] = std::to_wstring(line->Layer);
if (byFrame) { if (byFrame) {
if (paint_columns[2]) strings[2] = wxString::Format("%d", context->videoController->FrameAtTime(line->Start, agi::vfr::START)); if (paint_columns[2]) strings[2] = std::to_wstring(context->videoController->FrameAtTime(line->Start, agi::vfr::START));
if (paint_columns[3]) strings[3] = wxString::Format("%d", context->videoController->FrameAtTime(line->End, agi::vfr::END)); if (paint_columns[3]) strings[3] = std::to_wstring(context->videoController->FrameAtTime(line->End, agi::vfr::END));
} }
else { else {
if (paint_columns[2]) strings[2] = to_wx(line->Start.GetAssFormated()); if (paint_columns[2]) strings[2] = to_wx(line->Start.GetAssFormated());
@ -820,7 +820,7 @@ void BaseGrid::SetColumnWidths() {
// O(1) widths // O(1) widths
int marginLen = dc.GetTextExtent("0000").GetWidth(); int marginLen = dc.GetTextExtent("0000").GetWidth();
int labelLen = dc.GetTextExtent(wxString::Format("%d", GetRows())).GetWidth(); int labelLen = dc.GetTextExtent(std::to_wstring(GetRows())).GetWidth();
int startLen = 0; int startLen = 0;
int endLen = 0; int endLen = 0;
if (!byFrame) if (!byFrame)
@ -865,12 +865,12 @@ void BaseGrid::SetColumnWidths() {
} }
// Finish layer // Finish layer
int layerLen = maxLayer ? dc.GetTextExtent(wxString::Format("%d", maxLayer)).GetWidth() : 0; int layerLen = maxLayer ? dc.GetTextExtent(std::to_wstring(maxLayer)).GetWidth() : 0;
// Finish times // Finish times
if (byFrame) { if (byFrame) {
startLen = dc.GetTextExtent(wxString::Format("%d", maxStart)).GetWidth(); startLen = dc.GetTextExtent(std::to_wstring(maxStart)).GetWidth();
endLen = dc.GetTextExtent(wxString::Format("%d", maxEnd)).GetWidth(); endLen = dc.GetTextExtent(std::to_wstring(maxEnd)).GetWidth();
} }
// Set column widths // Set column widths

4
aegisub/src/dialog_properties.cpp
View file

@ -162,6 +162,6 @@ int DialogProperties::SetInfoIfDifferent(std::string const& key, std::string con
} }
void DialogProperties::OnSetFromVideo(wxCommandEvent &) { void DialogProperties::OnSetFromVideo(wxCommandEvent &) {
ResX->SetValue(wxString::Format("%d", c->videoController->GetWidth())); ResX->SetValue(std::to_wstring(c->videoController->GetWidth()));
ResY->SetValue(wxString::Format("%d", c->videoController->GetHeight())); ResY->SetValue(std::to_wstring(c->videoController->GetHeight()));
} }

2
aegisub/src/dialog_shift_times.cpp
View file

@ -85,7 +85,7 @@ static wxString get_history_string(json::Object &obj) {
int beg = (int64_t)(*it)["start"]; int beg = (int64_t)(*it)["start"];
int end = (int64_t)(*it)["end"]; int end = (int64_t)(*it)["end"];
if (beg == end) if (beg == end)
lines += wxString::Format("%d", beg); lines += std::to_wstring(beg);
else else
lines += wxString::Format("%d-%d", beg, end); lines += wxString::Format("%d-%d", beg, end);
if (it + 1 != sel.end()) if (it + 1 != sel.end())

4
aegisub/src/preferences_base.cpp
View file

@ -126,7 +126,7 @@ wxControl *OptionPage::OptionAdd(wxFlexGridSizer *flex, const wxString &name, co
} }
case agi::OptionValue::Type_Int: { case agi::OptionValue::Type_Int: {
wxSpinCtrl *sc = new wxSpinCtrl(this, -1, wxString::Format("%d", (int)opt->GetInt()), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, min, max, opt->GetInt()); wxSpinCtrl *sc = new wxSpinCtrl(this, -1, std::to_wstring((int)opt->GetInt()), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, min, max, opt->GetInt());
sc->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, IntUpdater(opt_name, parent)); sc->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, IntUpdater(opt_name, parent));
Add(flex, name, sc); Add(flex, name, sc);
return sc; return sc;
@ -240,7 +240,7 @@ void OptionPage::OptionFont(wxSizer *sizer, std::string opt_prefix) {
font_name->SetMinSize(wxSize(160, -1)); font_name->SetMinSize(wxSize(160, -1));
font_name->Bind(wxEVT_COMMAND_TEXT_UPDATED, StringUpdater(face_opt->GetName().c_str(), parent)); font_name->Bind(wxEVT_COMMAND_TEXT_UPDATED, StringUpdater(face_opt->GetName().c_str(), parent));
wxSpinCtrl *font_size = new wxSpinCtrl(this, -1, wxString::Format("%d", (int)size_opt->GetInt()), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 3, 42, size_opt->GetInt()); wxSpinCtrl *font_size = new wxSpinCtrl(this, -1, std::to_wstring((int)size_opt->GetInt()), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 3, 42, size_opt->GetInt());
font_size->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, IntUpdater(size_opt->GetName().c_str(), parent)); font_size->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, IntUpdater(size_opt->GetName().c_str(), parent));
wxButton *pick_btn = new wxButton(this, -1, _("Choose...")); wxButton *pick_btn = new wxButton(this, -1, _("Choose..."));

2
aegisub/src/timeedit_ctrl.cpp
View file

@ -129,7 +129,7 @@ void TimeEdit::OnModified(wxCommandEvent &event) {
void TimeEdit::UpdateText() { void TimeEdit::UpdateText() {
if (byFrame) if (byFrame)
ChangeValue(wxString::Format("%d", c->videoController->FrameAtTime(time, isEnd ? agi::vfr::END : agi::vfr::START))); ChangeValue(std::to_wstring(c->videoController->FrameAtTime(time, isEnd ? agi::vfr::END : agi::vfr::START)));
else else
ChangeValue(to_wx(time.GetAssFormated())); ChangeValue(to_wx(time.GetAssFormated()));
} }

2
aegisub/src/validators.cpp
View file

@ -184,7 +184,7 @@ bool NumValidator::TransferToWindow() {
if (isFloat) if (isFloat)
ctrl->SetValue(wxString::Format("%g",fValue)); ctrl->SetValue(wxString::Format("%g",fValue));
else else
ctrl->SetValue(wxString::Format("%d",iValue)); ctrl->SetValue(std::to_wstring(iValue));
return true; return true;
} }