Tidy up careful_string_filter and add some extra transliterations.

[dcpomatic.git] / src / wx / text_view.h

diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index d360838a834327ea5063d6d821dd1c6e65774691..f8aba8ffd23a893793e56b467a9e226e8a52c5e6 100644 (file)
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -19,13 +19,11 @@
 */
 
 #include "lib/content_text.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 
 class Decoder;
 class FilmViewer;
@@ -36,11 +34,11 @@ class TextView : public wxDialog
 public:
        TextView (
                wxWindow *,
-               boost::shared_ptr<Film>,
-               boost::shared_ptr<Content> content,
-               boost::shared_ptr<TextContent> caption,
-               boost::shared_ptr<Decoder>,
-               boost::weak_ptr<FilmViewer> viewer
+               std::shared_ptr<Film>,
+               std::shared_ptr<Content> content,
+               std::shared_ptr<TextContent> caption,
+               std::shared_ptr<Decoder>,
+               std::weak_ptr<FilmViewer> viewer
                );
 
 private:
@@ -53,6 +51,6 @@ private:
        boost::optional<FrameRateChange> _frc;
        boost::optional<int> _last_count;
        std::vector<dcpomatic::ContentTime> _start_times;
-       boost::weak_ptr<Content> _content;
-       boost::weak_ptr<FilmViewer> _film_viewer;
+       std::weak_ptr<Content> _content;
+       std::weak_ptr<FilmViewer> _film_viewer;
 };