summaryrefslogtreecommitdiff
path: root/src/wx/text_view.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-04 21:16:53 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-07 22:48:29 +0100
commitdd9be86db6cde0afa5da0d1d1ac43b42e05dca26 (patch)
treee56a3f82fb9e1c8602f265bea0d0688d8a018644 /src/wx/text_view.h
parent0d35820cf50d2789752b8776683b26d04642518d (diff)
std::shared_ptr
Diffstat (limited to 'src/wx/text_view.h')
-rw-r--r--src/wx/text_view.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index d360838a8..b44742b63 100644
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -24,8 +24,6 @@ DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
DCPOMATIC_ENABLE_WARNINGS
#include <wx/listctrl.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
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;
};