summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-06-09 21:16:12 +0200
committerCarl Hetherington <cth@carlh.net>2022-06-10 23:12:13 +0200
commit2f1986a814403d690aedcbe8b7057878ebae76b0 (patch)
tree3c9205c192ff4192a2d11c666093a007c4e60c11
parent9704833bdfc8c8f104203200be27f714fa677506 (diff)
C++11 tidying.
-rw-r--r--src/lib/string_text_file.cc4
-rw-r--r--src/tools/dcpomatic.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/string_text_file.cc b/src/lib/string_text_file.cc
index b8ca27e16..76abe547f 100644
--- a/src/lib/string_text_file.cc
+++ b/src/lib/string_text_file.cc
@@ -118,7 +118,7 @@ optional<ContentTime>
StringTextFile::first () const
{
if (_subtitles.empty()) {
- return optional<ContentTime>();
+ return {};
}
return ContentTime::from_seconds(_subtitles[0].from.all_as_seconds());
@@ -128,7 +128,7 @@ ContentTime
StringTextFile::length () const
{
if (_subtitles.empty ()) {
- return ContentTime ();
+ return {};
}
return ContentTime::from_seconds (_subtitles.back().to.all_as_seconds ());
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index e9302c6a0..65574cc67 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -458,7 +458,7 @@ public:
set_film (film);
- JobManager::instance()->add(shared_ptr<Job>(new CheckContentChangeJob(film)));
+ JobManager::instance()->add(make_shared<CheckContentChangeJob>(film));
}
catch (FileNotFoundError& e) {
auto const dir = e.file().parent_path();