From c4403784febdbdd42e9c32e67fadb147f11fe566 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 8 May 2019 23:41:42 +0100 Subject: Put Time types in dcpomatic namespace. --- src/lib/content_text.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/lib/content_text.h') diff --git a/src/lib/content_text.h b/src/lib/content_text.h index 2d8910577..0c0df1ee6 100644 --- a/src/lib/content_text.h +++ b/src/lib/content_text.h @@ -33,22 +33,22 @@ class Image; class ContentText { public: - explicit ContentText (ContentTime f) + explicit ContentText (dcpomatic::ContentTime f) : _from (f) {} - ContentTime from () const { + dcpomatic::ContentTime from () const { return _from; } private: - ContentTime _from; + dcpomatic::ContentTime _from; }; class ContentBitmapText : public ContentText { public: - ContentBitmapText (ContentTime f, boost::shared_ptr im, dcpomatic::Rect r) + ContentBitmapText (dcpomatic::ContentTime f, boost::shared_ptr im, dcpomatic::Rect r) : ContentText (f) , sub (im, r) {} @@ -64,7 +64,7 @@ public: class ContentStringText : public ContentText { public: - ContentStringText (ContentTime f, std::list s) + ContentStringText (dcpomatic::ContentTime f, std::list s) : ContentText (f) , subs (s) {} -- cgit v1.2.3