From: Carl Hetherington Date: Thu, 7 Oct 2021 18:59:35 +0000 (+0200) Subject: C++11 tidying. X-Git-Tag: v2.15.167~5 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=5fa04f74b6ac83fe985f9c64ce069151d560dbae C++11 tidying. --- diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index e454853a1..b521234fc 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -18,6 +18,7 @@ */ + #include "atmos_content.h" #include "dcp_content.h" #include "video_content.h" @@ -45,25 +46,24 @@ #include "i18n.h" + using std::cout; -using std::distance; +using std::dynamic_pointer_cast; +using std::function; using std::list; using std::make_shared; -using std::map; -using std::pair; using std::shared_ptr; using std::string; using std::vector; -using boost::scoped_ptr; using boost::optional; -using std::function; -using std::dynamic_pointer_cast; +using boost::scoped_ptr; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif using dcp::raw_convert; using namespace dcpomatic; + int const DCPContentProperty::NEEDS_ASSETS = 600; int const DCPContentProperty::NEEDS_KDM = 601; int const DCPContentProperty::REFERENCE_VIDEO = 602; @@ -73,6 +73,7 @@ int const DCPContentProperty::NAME = 605; int const DCPContentProperty::TEXTS = 606; int const DCPContentProperty::CPL = 607; + DCPContent::DCPContent (boost::filesystem::path p) : _encrypted (false) , _needs_assets (false) diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc index ffdcad1c1..e290a966a 100644 --- a/src/lib/dcp_examiner.cc +++ b/src/lib/dcp_examiner.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2020 Carl Hetherington + Copyright (C) 2014-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "dcp_examiner.h" #include "dcp_content.h" #include "exceptions.h" @@ -48,13 +49,11 @@ #include "i18n.h" -using std::list; + using std::cout; -using std::runtime_error; -using std::map; +using std::dynamic_pointer_cast; using std::shared_ptr; using std::string; -using std::dynamic_pointer_cast; using boost::optional;