std::shared_ptr

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

diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h
index 27cfed53eef989373eee4db604886d4890c3facb..fcc0680647734c7dc80ca906b42e2eb0ef324266 100644 (file)
--- a/src/wx/timeline_content_view.h
+++ b/src/wx/timeline_content_view.h
@@ -22,8 +22,11 @@
 #define DCPOMATIC_TIMELINE_CONTENT_VIEW_H
 
 #include "lib/types.h"
+#include "lib/warnings.h"
 #include "timeline_view.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class Content;
@@ -34,13 +37,13 @@ class Content;
 class TimelineContentView : public TimelineView
 {
 public:
-       TimelineContentView (Timeline& tl, boost::shared_ptr<Content> c);
+       TimelineContentView (Timeline& tl, std::shared_ptr<Content> c);
 
        dcpomatic::Rect<int> bbox () const;
 
        void set_selected (bool s);
        bool selected () const;
-       boost::shared_ptr<Content> content () const;
+       std::shared_ptr<Content> content () const;
        void set_track (int t);
        void unset_track ();
        boost::optional<int> track () const;
@@ -52,7 +55,7 @@ public:
 
 protected:
 
-       boost::weak_ptr<Content> _content;
+       std::weak_ptr<Content> _content;
 
 private:
 
@@ -66,6 +69,6 @@ private:
        boost::signals2::scoped_connection _content_connection;
 };
 
-typedef std::vector<boost::shared_ptr<TimelineContentView> > TimelineContentViewList;
+typedef std::vector<std::shared_ptr<TimelineContentView> > TimelineContentViewList;
 
 #endif