C++11 tidying.

diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 8cb4166c11bd7f51446ba961c87f3468499f4151..42dace9ba81e817847ad159a8515507ab425a3a4 100644 (file)
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -878,7 +878,7 @@ TextPanel::update_outline_subtitles_in_viewer ()
                }
                fv->set_outline_subtitles (rect);
        } else {
                }
                fv->set_outline_subtitles (rect);
        } else {

-               fv->set_outline_subtitles (optional<dcpomatic::Rect<double> >());
+               fv->set_outline_subtitles ({});

        }
 }
 
        }
 }
 

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index d6d7f6e4c2a4a86e5bb79cd4ff78a7a70c698f81..f6ede297db3a809408c1a2f7dad9b68437760ed8 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -159,7 +159,7 @@ Timeline::paint_labels ()
        _labels_canvas->GetViewStart (&vsx, &vsy);
        gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate + tracks_y_offset());
 
        _labels_canvas->GetViewStart (&vsx, &vsy);
        gc->Translate (-vsx * _x_scroll_rate, -vsy * _y_scroll_rate + tracks_y_offset());
 

-       _labels_view->paint (gc, list<dcpomatic::Rect<int> >());
+       _labels_view->paint (gc, {});

 
        delete gc;
 }
 
        delete gc;
 }