- map<string, dcp::ArrayData> fm = i->main_subtitle()->asset()->font_data();
- for (map<string, dcp::ArrayData>::const_iterator j = fm.begin(); j != fm.end(); ++j) {
- data.push_back (FontData(j->first, j->second));
+ for (auto const& j: i->main_subtitle()->asset()->font_data()) {
+ data.push_back (FontData(j.first, j.second));