diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-04 21:16:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-07 22:48:29 +0100 |
| commit | dd9be86db6cde0afa5da0d1d1ac43b42e05dca26 (patch) | |
| tree | e56a3f82fb9e1c8602f265bea0d0688d8a018644 /src/wx/screens_panel.h | |
| parent | 0d35820cf50d2789752b8776683b26d04642518d (diff) | |
std::shared_ptr
Diffstat (limited to 'src/wx/screens_panel.h')
| -rw-r--r-- | src/wx/screens_panel.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h index 69d74b13b..35d935bea 100644 --- a/src/wx/screens_panel.h +++ b/src/wx/screens_panel.h @@ -24,7 +24,6 @@ DCPOMATIC_DISABLE_WARNINGS DCPOMATIC_ENABLE_WARNINGS #include <wx/srchctrl.h> #include <wx/treectrl.h> -#include <boost/shared_ptr.hpp> #include <boost/signals2.hpp> #include <list> #include <map> @@ -41,15 +40,15 @@ public: explicit ScreensPanel (wxWindow* parent); ~ScreensPanel (); - std::list<boost::shared_ptr<dcpomatic::Screen> > screens () const; + std::list<std::shared_ptr<dcpomatic::Screen> > screens () const; void setup_sensitivity (); boost::signals2::signal<void ()> ScreensChanged; private: void add_cinemas (); - boost::optional<wxTreeItemId> add_cinema (boost::shared_ptr<Cinema>); - boost::optional<wxTreeItemId> add_screen (boost::shared_ptr<Cinema>, boost::shared_ptr<dcpomatic::Screen>); + boost::optional<wxTreeItemId> add_cinema (std::shared_ptr<Cinema>); + boost::optional<wxTreeItemId> add_screen (std::shared_ptr<Cinema>, std::shared_ptr<dcpomatic::Screen>); void add_cinema_clicked (); void edit_cinema_clicked (); void remove_cinema_clicked (); @@ -70,8 +69,8 @@ private: wxButton* _remove_screen; wxTreeItemId _root; - typedef std::map<wxTreeItemId, boost::shared_ptr<Cinema> > CinemaMap; - typedef std::map<wxTreeItemId, boost::shared_ptr<dcpomatic::Screen> > ScreenMap; + typedef std::map<wxTreeItemId, std::shared_ptr<Cinema> > CinemaMap; + typedef std::map<wxTreeItemId, std::shared_ptr<dcpomatic::Screen> > ScreenMap; CinemaMap _cinemas; ScreenMap _screens; |
