Assorted C++11/formatting cleanups.

[dcpomatic.git] / src / lib / dcp.cc

diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index 06e3e15d5525408e9dbd62b3ca2d090fcd3c84af..d99c32bf3b8fc928504e3d0d8d78c00a6c6a5155 100644 (file)
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,19 +18,20 @@
 
 */
 
-#include "dcp.h"
-#include "config.h"
-#include "film.h"
-#include "log.h"
-#include "dcpomatic_log.h"
+
 #include "compose.hpp"
+#include "dcp.h"
 #include "dcp_content.h"
+#include "dcpomatic_log.h"
+#include "log.h"
+#include "util.h"
 #include <dcp/dcp.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
 
 #include "i18n.h"
 
+
 using std::list;
 using std::string;
 using std::shared_ptr;
@@ -40,7 +41,7 @@ using std::vector;
 
 
 /** Find all the CPLs in our directories, cross-add assets and return the CPLs */
-list<shared_ptr<dcp::CPL> >
+list<shared_ptr<dcp::CPL>>
 DCP::cpls () const
 {
        list<shared_ptr<dcp::DCP>> dcps;
@@ -77,7 +78,7 @@ DCP::cpls () const
        }
 
        if (_dcp_content->kdm ()) {
-               dcp::DecryptedKDM k = decrypt_kdm_with_helpful_error (_dcp_content->kdm().get());
+               auto k = decrypt_kdm_with_helpful_error (_dcp_content->kdm().get());
                for (auto i: dcps) {
                        i->add (k);
                }