From 20a7ec786f3cb3e1b263820c8e56cca757e6a461 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sun, 25 May 2014 07:41:21 -0700 Subject: [PATCH] Use initializer lists rather than std::make_pair --- libaegisub/common/util.cpp | 4 ++-- libaegisub/include/libaegisub/character_count.h | 2 +- libaegisub/include/libaegisub/hotkey.h | 2 +- libaegisub/include/libaegisub/mru.h | 2 +- libaegisub/include/libaegisub/option.h | 2 +- libaegisub/include/libaegisub/signal.h | 2 +- src/ass_file.cpp | 2 +- src/ass_parser.cpp | 2 +- src/dialog_autosave.cpp | 2 +- src/dialog_kara_timing_copy.cpp | 2 +- src/dialog_properties.cpp | 2 +- src/gl_text.cpp | 2 +- src/hotkey.cpp | 4 ++-- src/menu.cpp | 4 ++-- src/spline_curve.cpp | 12 +++++++----- src/subs_edit_box.cpp | 2 +- src/subs_edit_ctrl.cpp | 6 +++--- src/utils.cpp | 2 +- 18 files changed, 29 insertions(+), 27 deletions(-) diff --git a/libaegisub/common/util.cpp b/libaegisub/common/util.cpp index 18d14a8a3..4d3a1544b 100644 --- a/libaegisub/common/util.cpp +++ b/libaegisub/common/util.cpp @@ -49,7 +49,7 @@ std::pair find_range(std::string const& haystack, std::string co const size_t match_start = haystack.find(needle, start); if (match_start == std::string::npos) return bad_match; - return std::make_pair(match_start, match_start + needle.size()); + return {match_start, match_start + needle.size()}; } } @@ -115,7 +115,7 @@ std::pair ifind(std::string const& haystack, std::string const& if (folded_pos > match.second) return bad_match; - return std::make_pair(start, distance(begin(haystack), begin(*haystack_it))); + return {start, distance(begin(haystack), begin(*haystack_it))}; }; auto ret = map_folded_to_raw(); diff --git a/libaegisub/include/libaegisub/character_count.h b/libaegisub/include/libaegisub/character_count.h index 511f52d91..45ce53ce5 100644 --- a/libaegisub/include/libaegisub/character_count.h +++ b/libaegisub/include/libaegisub/character_count.h @@ -32,4 +32,4 @@ namespace agi { /// Get index in bytes of the nth character in str, or str.size() if str /// has less than n characters size_t IndexOfCharacter(std::string const& str, size_t n); -} \ No newline at end of file +} diff --git a/libaegisub/include/libaegisub/hotkey.h b/libaegisub/include/libaegisub/hotkey.h index f7e663161..8b2b3fc26 100644 --- a/libaegisub/include/libaegisub/hotkey.h +++ b/libaegisub/include/libaegisub/hotkey.h @@ -102,7 +102,7 @@ public: template Hotkey(agi::fs::path const& file, const char (&default_config)[N]) - : Hotkey(file, std::make_pair(default_config, N - 1)) { } + : Hotkey(file, {default_config, N - 1}) { } /// Scan for a matching key. /// @param context Context requested. diff --git a/libaegisub/include/libaegisub/mru.h b/libaegisub/include/libaegisub/mru.h index 34b80824c..4a971c10c 100644 --- a/libaegisub/include/libaegisub/mru.h +++ b/libaegisub/include/libaegisub/mru.h @@ -58,7 +58,7 @@ public: template MRUManager(agi::fs::path const& file, const char (&default_config)[N]) - : MRUManager(file, std::make_pair(default_config, N - 1)) { } + : MRUManager(file, {default_config, N - 1}) { } /// Destructor ~MRUManager(); diff --git a/libaegisub/include/libaegisub/option.h b/libaegisub/include/libaegisub/option.h index d4bb42be7..e45ba1b8a 100644 --- a/libaegisub/include/libaegisub/option.h +++ b/libaegisub/include/libaegisub/option.h @@ -72,7 +72,7 @@ public: template Options(agi::fs::path const& file, const char (&default_config)[N], const OptionSetting setting = NONE) - : Options(file, std::make_pair(default_config, N - 1), setting) { } + : Options(file, {default_config, N - 1}, setting) { } /// Destructor ~Options(); diff --git a/libaegisub/include/libaegisub/signal.h b/libaegisub/include/libaegisub/signal.h index 50394896f..93b773e1a 100644 --- a/libaegisub/include/libaegisub/signal.h +++ b/libaegisub/include/libaegisub/signal.h @@ -135,7 +135,7 @@ class Signal final : private detail::SignalBase { UnscopedConnection DoConnect(Slot sig) { auto token = MakeToken(); - slots.insert(std::make_pair(token, sig)); + slots.emplace(token, sig); return UnscopedConnection(token); } diff --git a/src/ass_file.cpp b/src/ass_file.cpp index e5090ec02..6b443a86a 100644 --- a/src/ass_file.cpp +++ b/src/ass_file.cpp @@ -233,7 +233,7 @@ void AssFile::Sort(EntryList &lst, CompFunc comp, std::setnext_extradata_id = std::max(id+1, target->next_extradata_id); - target->Extradata[id] = std::make_pair(key, value); + target->Extradata[id] = {key, value}; } } diff --git a/src/dialog_autosave.cpp b/src/dialog_autosave.cpp index 00c7ada9c..b06c94c0b 100644 --- a/src/dialog_autosave.cpp +++ b/src/dialog_autosave.cpp @@ -139,7 +139,7 @@ void DialogAutosave::Populate(std::map &files_map, std:: auto it = files_map.find(name); if (it == files_map.end()) - it = files_map.insert(std::make_pair(name, AutosaveFile{name})).first; + it = files_map.insert({name, AutosaveFile{name}}).first; it->second.versions.push_back(Version{wxFileName(directory, fn).GetFullPath(), date, wxString::Format(name_fmt, date.Format())}); } while (dir.GetNext(&fn)); } diff --git a/src/dialog_kara_timing_copy.cpp b/src/dialog_kara_timing_copy.cpp index 7b0db5184..0c1891da4 100644 --- a/src/dialog_kara_timing_copy.cpp +++ b/src/dialog_kara_timing_copy.cpp @@ -625,7 +625,7 @@ void DialogKanjiTimer::OnAccept(wxCommandEvent &) { if (display->GetRemainingSource() > 0) wxMessageBox(_("Group all of the source text."),_("Error"),wxICON_EXCLAMATION | wxOK); else { - LinesToChange.push_back(std::make_pair(currentDestinationLine, display->GetOutputLine())); + LinesToChange.emplace_back(currentDestinationLine, display->GetOutputLine()); currentSourceLine = FindNextStyleMatch(currentSourceLine, from_wx(SourceStyle->GetValue())); currentDestinationLine = FindNextStyleMatch(currentDestinationLine, from_wx(DestStyle->GetValue())); diff --git a/src/dialog_properties.cpp b/src/dialog_properties.cpp index eae2f49e8..5b0f21996 100644 --- a/src/dialog_properties.cpp +++ b/src/dialog_properties.cpp @@ -174,7 +174,7 @@ void DialogProperties::AddProperty(wxSizer *sizer, wxString const& label, std::s wxTextCtrl *ctrl = new wxTextCtrl(this, -1, to_wx(c->ass->GetScriptInfo(property)), wxDefaultPosition, wxSize(200, 20)); sizer->Add(new wxStaticText(this, -1, label), wxSizerFlags().Center().Left()); sizer->Add(ctrl, wxSizerFlags(1).Expand()); - properties.push_back(std::make_pair(property, ctrl)); + properties.push_back({property, ctrl}); } void DialogProperties::OnOK(wxCommandEvent &) { diff --git a/src/gl_text.cpp b/src/gl_text.cpp index 22e2f4ae3..50f83971d 100644 --- a/src/gl_text.cpp +++ b/src/gl_text.cpp @@ -291,7 +291,7 @@ OpenGLTextGlyph const& OpenGLText::GetGlyph(int i) { } OpenGLTextGlyph const& OpenGLText::CreateGlyph(int n) { - OpenGLTextGlyph &glyph = glyphs.insert(std::make_pair(n, OpenGLTextGlyph(n, font))).first->second; + OpenGLTextGlyph &glyph = glyphs.emplace(n, OpenGLTextGlyph(n, font)).first->second; // Insert into some texture for (auto& texture : textures) { diff --git a/src/hotkey.cpp b/src/hotkey.cpp index 70d1b15b1..36570d3a5 100644 --- a/src/hotkey.cpp +++ b/src/hotkey.cpp @@ -101,11 +101,11 @@ void init() { auto hk_map = hotkey::inst->GetHotkeyMap(); for (auto const& hotkey : boost::make_iterator_range(hk_map.equal_range("edit/line/duplicate/shift"))) { auto combo = agi::hotkey::Combo(hotkey.second.Context(), "edit/line/split/before", hotkey.second.Get()); - hk_map.insert(std::make_pair(combo.CmdName(), combo)); + hk_map.insert({combo.CmdName(), combo}); } for (auto const& hotkey : boost::make_iterator_range(hk_map.equal_range("edit/line/duplicate/shift_back"))) { auto combo = agi::hotkey::Combo(hotkey.second.Context(), "edit/line/split/after", hotkey.second.Get()); - hk_map.insert(std::make_pair(combo.CmdName(), combo)); + hk_map.insert({combo.CmdName(), combo}); } hk_map.erase("edit/line/duplicate/shift"); diff --git a/src/menu.cpp b/src/menu.cpp index 133c48b89..3815536c4 100644 --- a/src/menu.cpp +++ b/src/menu.cpp @@ -195,9 +195,9 @@ public: items.push_back(co->name()); if (flags != cmd::COMMAND_NORMAL) - dynamic_items.push_back(std::make_pair(co->name(), item)); + dynamic_items.emplace_back(co->name(), item); else - static_items.push_back(std::make_pair(co->name(), item)); + static_items.emplace_back(co->name(), item); return item->GetId(); } diff --git a/src/spline_curve.cpp b/src/spline_curve.cpp index 2ea72b25a..b1a799a0f 100644 --- a/src/spline_curve.cpp +++ b/src/spline_curve.cpp @@ -47,9 +47,10 @@ SplineCurve::SplineCurve(Vector2D p1, Vector2D p2, Vector2D p3, Vector2D p4) std::pair SplineCurve::Split(float t) { if (type == LINE) { Vector2D m = p1 * (1 - t) + p2 * t; - return std::make_pair( + return { SplineCurve(p1, m), - SplineCurve(m, p2)); + SplineCurve(m, p2) + }; } else if (type == BICUBIC) { float u = 1 - t; @@ -60,11 +61,12 @@ std::pair SplineCurve::Split(float t) { Vector2D p234 = p23 * u + p34 * t; Vector2D p1234 = p123 * u + p234 * t; - return std::make_pair( + return { SplineCurve(p1, p12, p123, p1234), - SplineCurve(p1234, p234, p34, p4)); + SplineCurve(p1234, p234, p34, p4) + }; } - return std::make_pair(SplineCurve(p1), SplineCurve(p1)); + return {SplineCurve(p1), SplineCurve(p1)}; } void SplineCurve::Smooth(Vector2D p0, Vector2D p5, float smooth) { diff --git a/src/subs_edit_box.cpp b/src/subs_edit_box.cpp index ae34b93e7..8c4f78680 100644 --- a/src/subs_edit_box.cpp +++ b/src/subs_edit_box.cpp @@ -467,7 +467,7 @@ void SubsEditBox::CommitTimes(TimeField field) { auto const& sel = c->selectionController->GetSelectedSet(); for (AssDialogue *d : sel) { if (!initial_times.count(d)) - initial_times[d] = std::make_pair(d->Start, d->End); + initial_times[d] = {d->Start, d->End}; switch (field) { case TIME_START: diff --git a/src/subs_edit_ctrl.cpp b/src/subs_edit_ctrl.cpp index 13b5212a1..59dc2de1d 100644 --- a/src/subs_edit_ctrl.cpp +++ b/src/subs_edit_ctrl.cpp @@ -513,11 +513,11 @@ std::pair SubsTextEditCtrl::GetBoundsOfWordAtPosition(int pos) { for (auto const& tok : tokenized_line) { if (len + (int)tok.length > pos) { if (tok.type == agi::ass::DialogueTokenType::WORD) - return std::make_pair(len, tok.length); - return std::make_pair(0, 0); + return {len, tok.length}; + return {0, 0}; } len += tok.length; } - return std::make_pair(0, 0); + return {0, 0}; } diff --git a/src/utils.cpp b/src/utils.cpp index 4c275f721..0c17fa0fd 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -179,7 +179,7 @@ void CleanCache(agi::fs::path const& directory, std::string const& file_type, ui std::multimap cachefiles; for (auto const& file : agi::fs::DirectoryIterator(directory, file_type)) { agi::fs::path path = directory/file; - cachefiles.insert(std::make_pair(agi::fs::ModifiedTime(path), path)); + cachefiles.insert({agi::fs::ModifiedTime(path), path}); total_size += agi::fs::Size(path); }