C++11 tidying.

[dcpomatic.git] / src / wx / text_panel.cc

diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index a841d1654db52f9175f8b2263a9b125c7b9e57aa..42dace9ba81e817847ad159a8515507ab425a3a4 100644 (file)
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -45,10 +45,10 @@
 #include "lib/string_text_file_decoder.h"
 #include "lib/subtitle_analysis.h"
 #include "lib/text_content.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::cout;
@@ -878,7 +878,7 @@ TextPanel::update_outline_subtitles_in_viewer ()
                }
                fv->set_outline_subtitles (rect);
        } else {
-               fv->set_outline_subtitles (optional<dcpomatic::Rect<double> >());
+               fv->set_outline_subtitles ({});
        }
 }