Small C++11 tweaks.

[libsub.git] / src / subrip_reader.cc

diff --git a/src/subrip_reader.cc b/src/subrip_reader.cc
index 89a5599d54328adcccbedcf608a1f61e32f59807..8ba7c7ddc51f08f2434541d3d07d9fc6fffd129b 100644 (file)
--- a/src/subrip_reader.cc
+++ b/src/subrip_reader.cc
@@ -37,7 +37,6 @@
 
 using std::string;
 using std::vector;
-using std::list;
 using std::cout;
 using std::hex;
 using boost::lexical_cast;
@@ -74,7 +73,7 @@ SubripReader::read (function<optional<string> ()> get_line)
        rs.vertical_position.reference = TOP_OF_SUBTITLE;
 
        while (true) {
-               optional<string> line = get_line ();
+               auto line = get_line ();
                if (!line) {
                        break;
                }
@@ -198,7 +197,7 @@ SubripReader::convert_line (string t, RawSubtitle& p)
 
        string tag;
 
-       list<Colour> colours;
+       vector<Colour> colours;
        colours.push_back (Colour (1, 1, 1));
 
        /* XXX: missing <font> support */