diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-26 11:24:30 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-26 11:24:30 +0000 |
| commit | 257b936e9ed24043cfc1ed6e7e762858250bc388 (patch) | |
| tree | 17630aab92aba1673cfac163a3715f237372552a /src | |
| parent | 5dd999eb0960ed4db25e98f2c2a5e4da2de2ced9 (diff) | |
Small method name cleanup.
Diffstat (limited to 'src')
| -rw-r--r-- | src/subtitle_asset.cc | 22 | ||||
| -rw-r--r-- | src/subtitle_asset.h | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc index bdc630a0..5074c35b 100644 --- a/src/subtitle_asset.cc +++ b/src/subtitle_asset.cc @@ -67,12 +67,12 @@ SubtitleAsset::parse_subtitles ( { /* Make Subtitle objects to represent the raw XML nodes in a sane way */ ParseState parse_state; - examine_font_nodes (xml, font_nodes, parse_state); - examine_subtitle_nodes (xml, subtitle_nodes, parse_state); + examine_nodes (xml, font_nodes, parse_state); + examine_nodes (xml, subtitle_nodes, parse_state); } void -SubtitleAsset::examine_subtitle_nodes ( +SubtitleAsset::examine_nodes ( shared_ptr<const cxml::Node> xml, list<shared_ptr<dcp::SubtitleNode> > const & subtitle_nodes, ParseState& parse_state @@ -80,14 +80,14 @@ SubtitleAsset::examine_subtitle_nodes ( { BOOST_FOREACH (shared_ptr<dcp::SubtitleNode> i, subtitle_nodes) { parse_state.subtitle_nodes.push_back (i); - examine_text_nodes (xml, i->text_nodes, parse_state); - examine_font_nodes (xml, i->font_nodes, parse_state); + examine_nodes (xml, i->text_nodes, parse_state); + examine_nodes (xml, i->font_nodes, parse_state); parse_state.subtitle_nodes.pop_back (); } } void -SubtitleAsset::examine_font_nodes ( +SubtitleAsset::examine_nodes ( shared_ptr<const cxml::Node> xml, list<shared_ptr<dcp::FontNode> > const & font_nodes, ParseState& parse_state @@ -98,16 +98,16 @@ SubtitleAsset::examine_font_nodes ( parse_state.font_nodes.push_back (i); maybe_add_subtitle (i->text, parse_state); - examine_subtitle_nodes (xml, i->subtitle_nodes, parse_state); - examine_font_nodes (xml, i->font_nodes, parse_state); - examine_text_nodes (xml, i->text_nodes, parse_state); + examine_nodes (xml, i->subtitle_nodes, parse_state); + examine_nodes (xml, i->font_nodes, parse_state); + examine_nodes (xml, i->text_nodes, parse_state); parse_state.font_nodes.pop_back (); } } void -SubtitleAsset::examine_text_nodes ( +SubtitleAsset::examine_nodes ( shared_ptr<const cxml::Node> xml, list<shared_ptr<dcp::TextNode> > const & text_nodes, ParseState& parse_state @@ -116,7 +116,7 @@ SubtitleAsset::examine_text_nodes ( BOOST_FOREACH (shared_ptr<dcp::TextNode> i, text_nodes) { parse_state.text_nodes.push_back (i); maybe_add_subtitle (i->text, parse_state); - examine_font_nodes (xml, i->font_nodes, parse_state); + examine_nodes (xml, i->font_nodes, parse_state); parse_state.text_nodes.pop_back (); } } diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h index ebd6b745..d3f186ef 100644 --- a/src/subtitle_asset.h +++ b/src/subtitle_asset.h @@ -132,19 +132,19 @@ private: void maybe_add_subtitle (std::string text, ParseState const & parse_state); - void examine_font_nodes ( + void examine_nodes ( boost::shared_ptr<const cxml::Node> xml, std::list<boost::shared_ptr<FontNode> > const & font_nodes, ParseState& parse_state ); - void examine_text_nodes ( + void examine_nodes ( boost::shared_ptr<const cxml::Node> xml, std::list<boost::shared_ptr<TextNode> > const & text_nodes, ParseState& parse_state ); - void examine_subtitle_nodes ( + void examine_nodes ( boost::shared_ptr<const cxml::Node> xml, std::list<boost::shared_ptr<SubtitleNode> > const & subtitle_nodes, ParseState& parse_state |