std::shared_ptr

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

diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc
index 156f82ab5eb3a417882cac6f247090ce9314119a..c44e38146a0c4e3a91daf98938662eb80c345136 100644 (file)
--- a/src/wx/smpte_metadata_dialog.cc
+++ b/src/wx/smpte_metadata_dialog.cc
@@ -32,8 +32,8 @@
 using std::string;
 using std::vector;
 using boost::optional;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -66,7 +66,7 @@ content_versions_column (string v, int)
 
 SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr<Film> weak_film)
        : wxDialog (parent, wxID_ANY, _("Metadata"))
-       , _film (weak_film)
+       , WeakFilm (weak_film)
 {
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
        SetSizer (overall_sizer);
@@ -367,15 +367,6 @@ SMPTEMetadataDialog::edit_release_territory ()
 }
 
 
-shared_ptr<Film>
-SMPTEMetadataDialog::film () const
-{
-       shared_ptr<Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-       return film;
-}
-
-
 void
 SMPTEMetadataDialog::version_number_changed ()
 {