projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 2573e3cb311b970cc181c1a76825b04beaa955bc..fcc0680647734c7dc80ca906b42e2eb0ef324266 100644
(file)
--- a/
src/wx/timeline_content_view.h
+++ b/
src/wx/timeline_content_view.h
@@
-37,13
+37,13
@@
class Content;
class TimelineContentView : public TimelineView
{
public:
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;
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;
void set_track (int t);
void unset_track ();
boost::optional<int> track () const;
@@
-55,7
+55,7
@@
public:
protected:
protected:
-
boost
::weak_ptr<Content> _content;
+
std
::weak_ptr<Content> _content;
private:
private:
@@
-69,6
+69,6
@@
private:
boost::signals2::scoped_connection _content_connection;
};
boost::signals2::scoped_connection _content_connection;
};
-typedef std::vector<
boost
::shared_ptr<TimelineContentView> > TimelineContentViewList;
+typedef std::vector<
std
::shared_ptr<TimelineContentView> > TimelineContentViewList;
#endif
#endif