From 6e3cc883b32624b596cdcd46601d60b1f16e284f Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sat, 22 Dec 2012 15:35:13 -0800 Subject: [PATCH] Replace most uses of type::iterator with auto --- aegisub/src/aegisublocale.cpp | 2 +- aegisub/src/ass_exporter.cpp | 5 ++--- aegisub/src/ass_karaoke.cpp | 2 +- aegisub/src/ass_karaoke.h | 1 - aegisub/src/ass_override.cpp | 2 +- aegisub/src/audio_display.cpp | 4 ++-- aegisub/src/audio_player_portaudio.cpp | 4 ++-- aegisub/src/audio_timing_karaoke.cpp | 2 +- aegisub/src/auto4_lua_assfile.cpp | 16 ++++++++-------- aegisub/src/block_cache.h | 2 +- aegisub/src/dialog_manager.h | 4 ++-- aegisub/src/dialog_style_manager.cpp | 2 +- aegisub/src/frame_main.cpp | 2 +- aegisub/src/gl_text.cpp | 6 ++---- aegisub/src/standard_paths.cpp | 2 +- aegisub/src/visual_tool_vector_clip.cpp | 4 ++-- 16 files changed, 28 insertions(+), 32 deletions(-) diff --git a/aegisub/src/aegisublocale.cpp b/aegisub/src/aegisublocale.cpp index b9ad27c34..f6957b274 100644 --- a/aegisub/src/aegisublocale.cpp +++ b/aegisub/src/aegisublocale.cpp @@ -79,7 +79,7 @@ wxString AegisubLocale::PickLanguage() { // Check if user local language is available, if so, make it first const wxLanguageInfo *info = wxLocale::GetLanguageInfo(wxLocale::GetSystemLanguage()); if (info) { - wxArrayString::iterator it = std::find(langs.begin(), langs.end(), info->CanonicalName); + auto it = std::find(langs.begin(), langs.end(), info->CanonicalName); if (it != langs.end()) std::rotate(langs.begin(), it, it + 1); } diff --git a/aegisub/src/ass_exporter.cpp b/aegisub/src/ass_exporter.cpp index c5e13a796..d632d27ff 100644 --- a/aegisub/src/ass_exporter.cpp +++ b/aegisub/src/ass_exporter.cpp @@ -115,9 +115,8 @@ void AssExporter::Export(wxString const& filename, wxString const& charset, wxWi } wxSizer *AssExporter::GetSettingsSizer(wxString const& name) { - std::map::iterator pos = Sizers.find(name); - if (pos == Sizers.end()) return 0; - return pos->second; + auto pos = Sizers.find(name); + return pos == Sizers.end() ? nullptr : pos->second; } wxString const& AssExporter::GetDescription(wxString const& name) const { diff --git a/aegisub/src/ass_karaoke.cpp b/aegisub/src/ass_karaoke.cpp index 6683a5da6..f20032332 100644 --- a/aegisub/src/ass_karaoke.cpp +++ b/aegisub/src/ass_karaoke.cpp @@ -212,7 +212,7 @@ void AssKaraoke::AddSplit(size_t syl_idx, size_t pos) { // Move all override tags after the split to the new syllable and fix the indices size_t text_len = syl.text.size(); - for (ovr_iterator it = syl.ovr_tags.begin(); it != syl.ovr_tags.end(); ) { + for (auto it = syl.ovr_tags.begin(); it != syl.ovr_tags.end(); ) { if (it->first < text_len) ++it; else { diff --git a/aegisub/src/ass_karaoke.h b/aegisub/src/ass_karaoke.h index acb56511e..ffbd9e9bc 100644 --- a/aegisub/src/ass_karaoke.h +++ b/aegisub/src/ass_karaoke.h @@ -49,7 +49,6 @@ public: wxString GetText(bool k_tag) const; }; private: - typedef std::map::iterator ovr_iterator; std::vector syls; AssDialogue *active_line; diff --git a/aegisub/src/ass_override.cpp b/aegisub/src/ass_override.cpp index d5395eacc..da09d0d04 100644 --- a/aegisub/src/ass_override.cpp +++ b/aegisub/src/ass_override.cpp @@ -493,7 +493,7 @@ void AssOverrideTag::Clear() { void AssOverrideTag::SetText(const wxString &text) { load_protos(); - for (AssOverrideTagProto::iterator cur = proto.begin(); cur != proto.end(); ++cur) { + for (auto cur = proto.begin(); cur != proto.end(); ++cur) { if (text.StartsWith(cur->name)) { Name = cur->name; parse_parameters(this, text.Mid(Name.length()), cur); diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp index 40cf6c515..be3361856 100644 --- a/aegisub/src/audio_display.cpp +++ b/aegisub/src/audio_display.cpp @@ -806,8 +806,8 @@ void AudioDisplay::OnPaint(wxPaintEvent&) void AudioDisplay::PaintAudio(wxDC &dc, TimeRange updtime, wxRect updrect) { - std::map::iterator pt = style_ranges.upper_bound(updtime.begin()); - std::map::iterator pe = style_ranges.upper_bound(updtime.end()); + auto pt = style_ranges.upper_bound(updtime.begin()); + auto pe = style_ranges.upper_bound(updtime.end()); if (pt != style_ranges.begin()) --pt; diff --git a/aegisub/src/audio_player_portaudio.cpp b/aegisub/src/audio_player_portaudio.cpp index fc40ebda5..63a40fb7e 100644 --- a/aegisub/src/audio_player_portaudio.cpp +++ b/aegisub/src/audio_player_portaudio.cpp @@ -110,7 +110,7 @@ void PortAudioPlayer::GatherDevices(PaHostApiIndex host_idx) { if (device_info->maxOutputChannels <= 0) continue; // MME truncates device names so check for prefix rather than exact match - std::map::iterator dev_it = devices.lower_bound(device_info->name); + auto dev_it = devices.lower_bound(device_info->name); if (dev_it == devices.end() || dev_it->first.find(device_info->name) != 0) { devices[device_info->name]; --dev_it; @@ -275,7 +275,7 @@ wxArrayString PortAudioPlayer::GetOutputDevices() { try { PortAudioPlayer player(0); - for (std::map::iterator it = player.devices.begin(); it != player.devices.end(); ++it) + for (auto it = player.devices.begin(); it != player.devices.end(); ++it) list.push_back(to_wx(it->first)); } catch (PortAudioError const&) { diff --git a/aegisub/src/audio_timing_karaoke.cpp b/aegisub/src/audio_timing_karaoke.cpp index 69c1c8995..91fdb1a8d 100644 --- a/aegisub/src/audio_timing_karaoke.cpp +++ b/aegisub/src/audio_timing_karaoke.cpp @@ -285,7 +285,7 @@ void AudioTimingControllerKaraoke::Revert() { markers.reserve(kara->size()); labels.reserve(kara->size()); - for (AssKaraoke::iterator it = kara->begin(); it != kara->end(); ++it) { + for (auto it = kara->begin(); it != kara->end(); ++it) { if (it != kara->begin()) markers.emplace_back(it->start_time, &separator_pen, AudioMarker::Feet_None); labels.emplace_back(it->text, TimeRange(it->start_time, it->start_time + it->duration)); diff --git a/aegisub/src/auto4_lua_assfile.cpp b/aegisub/src/auto4_lua_assfile.cpp index 6c95b2321..5060ba569 100644 --- a/aegisub/src/auto4_lua_assfile.cpp +++ b/aegisub/src/auto4_lua_assfile.cpp @@ -516,7 +516,7 @@ namespace Automation4 { modification_type |= modification_mask(e); // Find the appropriate place to put it - std::vector::iterator it = lines.end(); + auto it = lines.end(); if (!lines.empty()) { do { --it; @@ -592,14 +592,14 @@ namespace Automation4 { lua_rawseti(L, -2, idx++); AssKaraoke kara(dia, false, false); - for (AssKaraoke::iterator it = kara.begin(); it != kara.end(); ++it) { + for (auto const& syl : kara) { lua_newtable(L); - set_field(L, "duration", it->duration); - set_field(L, "start_time", it->start_time - dia->Start); - set_field(L, "end_time", it->start_time + it->duration - dia->Start); - set_field(L, "tag", it->tag_type); - set_field(L, "text", it->GetText(false)); - set_field(L, "text_stripped", it->text); + set_field(L, "duration", syl.duration); + set_field(L, "start_time", syl.start_time - dia->Start); + set_field(L, "end_time", syl.start_time + syl.duration - dia->Start); + set_field(L, "tag", syl.tag_type); + set_field(L, "text", syl.GetText(false)); + set_field(L, "text_stripped", syl.text); lua_rawseti(L, -2, idx++); } diff --git a/aegisub/src/block_cache.h b/aegisub/src/block_cache.h index 8e5568c65..dffcff6d2 100644 --- a/aegisub/src/block_cache.h +++ b/aegisub/src/block_cache.h @@ -209,7 +209,7 @@ public: // Sum up data size until we hit the max size_t cur_size = 0; size_t block_size = factory.GetBlockSize(); - typename AgeList::iterator it = age.begin(); + auto it = age.begin(); for (; it != age.end() && cur_size < max_size; ++it) { BlockArray &ba = (*it)->blocks; diff --git a/aegisub/src/dialog_manager.h b/aegisub/src/dialog_manager.h index 3e3394cf9..edf54c897 100644 --- a/aegisub/src/dialog_manager.h +++ b/aegisub/src/dialog_manager.h @@ -47,7 +47,7 @@ class DialogManager { wxDialog *dialog = static_cast(evt.GetEventObject()); dialog->Destroy(); - for (DialogMap::iterator it = created_dialogs.begin(); it != created_dialogs.end(); ++it) { + for (auto it = created_dialogs.begin(); it != created_dialogs.end(); ++it) { if (it->second == dialog) { created_dialogs.erase(it); return; @@ -60,7 +60,7 @@ public: /// @tparam DialogType Type of dialog to show template void Show(agi::Context *c) { - DialogMap::iterator it = created_dialogs.find(&typeid(DialogType)); + auto it = created_dialogs.find(&typeid(DialogType)); if (it != created_dialogs.end()) { it->second->Show(); diff --git a/aegisub/src/dialog_style_manager.cpp b/aegisub/src/dialog_style_manager.cpp index ed9b77769..895de47ef 100644 --- a/aegisub/src/dialog_style_manager.cpp +++ b/aegisub/src/dialog_style_manager.cpp @@ -704,7 +704,7 @@ void DialogStyleManager::UpdateButtons() { template static void do_move(Cont& styls, int type, int& first, int& last, bool storage) { - typename Cont::iterator begin = styls.begin(); + auto begin = styls.begin(); // Move up if (type == 0) { diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index f10bcd0c6..a1b33c669 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -315,7 +315,7 @@ FrameMain::FrameMain (wxArrayString args) static bool delete_children(wxWindow *window, wxWindow *keep) { bool found = false; while (window->GetChildren().size() > (size_t)found) { - wxWindowList::iterator it = window->GetChildren().begin(); + auto it = window->GetChildren().begin(); if (*it == keep) found = true; diff --git a/aegisub/src/gl_text.cpp b/aegisub/src/gl_text.cpp index a38d75ae6..43bd695fe 100644 --- a/aegisub/src/gl_text.cpp +++ b/aegisub/src/gl_text.cpp @@ -338,10 +338,8 @@ void OpenGLText::GetExtent(wxString const& text, int &w, int &h) { } OpenGLTextGlyph const& OpenGLText::GetGlyph(int i) { - glyphMap::iterator res = glyphs.find(i); - - if (res != glyphs.end()) return res->second; - return CreateGlyph(i); + auto res = glyphs.find(i); + return res != glyphs.end() ? res->second : CreateGlyph(i); } OpenGLTextGlyph const& OpenGLText::CreateGlyph(int n) { diff --git a/aegisub/src/standard_paths.cpp b/aegisub/src/standard_paths.cpp index 544ab4487..9be84b380 100644 --- a/aegisub/src/standard_paths.cpp +++ b/aegisub/src/standard_paths.cpp @@ -80,7 +80,7 @@ wxString StandardPaths::DoDecodePath(wxString path) { } // Replace ?part if valid - std::map::iterator iter = paths.find(path1); + auto iter = paths.find(path1); if (iter == paths.end()) return path; wxString final = iter->second + "/" + path2; final.Replace("//","/"); diff --git a/aegisub/src/visual_tool_vector_clip.cpp b/aegisub/src/visual_tool_vector_clip.cpp index f0379cb64..d63beec7a 100644 --- a/aegisub/src/visual_tool_vector_clip.cpp +++ b/aegisub/src/visual_tool_vector_clip.cpp @@ -185,7 +185,7 @@ void VisualToolVectorClip::MakeFeatures() { sel_features.clear(); features.clear(); active_feature = features.end(); - for (Spline::iterator it = spline.begin(); it != spline.end(); ++it) + for (auto it = spline.begin(); it != spline.end(); ++it) MakeFeature(it); } @@ -217,7 +217,7 @@ bool VisualToolVectorClip::InitializeDrag(feature_iterator feature) { feature->curve->p2 = feature->curve->p4; } else { - Spline::iterator next = std::next(feature->curve); + auto next = std::next(feature->curve); if (next != spline.end()) { if (feature->curve->type == SplineCurve::POINT) { next->p1 = next->EndPoint();