C++11 tidying.

5 files changed, 36 insertions, 24 deletions

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index c94e0b91f..448902e1e 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -205,8 +205,7 @@ AnalyseAudioJob::run ()
 		/* If there was only one piece of content in this analysis we may later need to know what its
 		   gain was when we analysed it.
 		*/
-		shared_ptr<const AudioContent> ac = _playlist->content().front()->audio;
-		if (ac) {
+		if (auto ac = _playlist->content().front()->audio) {
 			_analysis->set_analysis_gain (ac->gain());
 		}
 	}
diff --git a/src/lib/dkdm_wrapper.cc b/src/lib/dkdm_wrapper.cc
index 74a71966e..4698c159d 100644
--- a/src/lib/dkdm_wrapper.cc
+++ b/src/lib/dkdm_wrapper.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "compose.hpp"
 #include "dkdm_wrapper.h"
 #include "dcpomatic_assert.h"
@@ -26,78 +27,85 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 DCPOMATIC_ENABLE_WARNINGS
 
+
 using std::string;
 using std::list;
 using std::shared_ptr;
+using std::make_shared;
 using std::dynamic_pointer_cast;
 
+
 shared_ptr<DKDMBase>
 DKDMBase::read (cxml::ConstNodePtr node)
 {
 	if (node->name() == "DKDM") {
-		return shared_ptr<DKDM> (new DKDM (dcp::EncryptedKDM (node->content ())));
+		return make_shared<DKDM>(dcp::EncryptedKDM(node->content()));
 	} else if (node->name() == "DKDMGroup") {
-		shared_ptr<DKDMGroup> group (new DKDMGroup (node->string_attribute ("Name")));
+		auto group = make_shared<DKDMGroup>(node->string_attribute("Name"));
 		for (auto i: node->node_children()) {
-			shared_ptr<DKDMBase> c = read (i);
-			if (c) {
+			if (auto c = read(i)) {
 				group->add (c);
 			}
 		}
 		return group;
 	}
 
-	return shared_ptr<DKDMBase> ();
+	return {};
 }
 
+
 string
 DKDM::name () const
 {
 	return String::compose ("%1 (%2)", _dkdm.content_title_text(), _dkdm.cpl_id());
 }
 
+
 void
 DKDM::as_xml (xmlpp::Element* node) const
 {
 	node->add_child("DKDM")->add_child_text (_dkdm.as_xml ());
 }
 
+
 void
 DKDMGroup::as_xml (xmlpp::Element* node) const
 {
-	xmlpp::Element* f = node->add_child("DKDMGroup");
+	auto f = node->add_child("DKDMGroup");
 	f->set_attribute ("Name", _name);
 	for (auto i: _children) {
 		i->as_xml (f);
 	}
 }
 
+
 void
 DKDMGroup::add (shared_ptr<DKDMBase> child, shared_ptr<DKDM> previous)
 {
 	DCPOMATIC_ASSERT (child);
 	if (previous) {
-		list<shared_ptr<DKDMBase> >::iterator i = find (_children.begin(), _children.end(), previous);
-		if (i != _children.end ()) {
+		auto i = find (_children.begin(), _children.end(), previous);
+		if (i != _children.end()) {
 			++i;
 		}
 		_children.insert (i, child);
 	} else {
 		_children.push_back (child);
 	}
-	child->set_parent (dynamic_pointer_cast<DKDMGroup> (shared_from_this ()));
+	child->set_parent (dynamic_pointer_cast<DKDMGroup>(shared_from_this()));
 }
 
+
 void
 DKDMGroup::remove (shared_ptr<DKDMBase> child)
 {
-	for (list<shared_ptr<DKDMBase> >::iterator i = _children.begin(); i != _children.end(); ++i) {
+	for (auto i = _children.begin(); i != _children.end(); ++i) {
 		if (*i == child) {
 			_children.erase (i);
-			child->set_parent (shared_ptr<DKDMGroup> ());
+			child->set_parent (shared_ptr<DKDMGroup>());
 			return;
 		}
-		shared_ptr<DKDMGroup> g = dynamic_pointer_cast<DKDMGroup> (*i);
+		auto g = dynamic_pointer_cast<DKDMGroup> (*i);
 		if (g) {
 			g->remove (child);
 		}
diff --git a/src/lib/dkdm_wrapper.h b/src/lib/dkdm_wrapper.h
index 261cdc767..0c2992bc4 100644
--- a/src/lib/dkdm_wrapper.h
+++ b/src/lib/dkdm_wrapper.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include <dcp/encrypted_kdm.h>
 #include <libcxml/cxml.h>
 #include <memory>
@@ -27,8 +28,10 @@ namespace xmlpp {
 	class Element;
 }
 
+
 class DKDMGroup;
 
+
 class DKDMBase : public std::enable_shared_from_this<DKDMBase>
 {
 public:
@@ -50,6 +53,7 @@ private:
 	std::shared_ptr<DKDMGroup> _parent;
 };
 
+
 class DKDM : public DKDMBase
 {
 public:
@@ -68,6 +72,7 @@ private:
 	dcp::EncryptedKDM _dkdm;
 };
 
+
 class DKDMGroup : public DKDMBase
 {
 public:
@@ -81,14 +86,14 @@ public:
 
 	void as_xml (xmlpp::Element *) const;
 
-	std::list<std::shared_ptr<DKDMBase> > children () const {
+	std::list<std::shared_ptr<DKDMBase>> children () const {
 		return _children;
 	}
 
-	void add (std::shared_ptr<DKDMBase> child, std::shared_ptr<DKDM> previous = std::shared_ptr<DKDM> ());
+	void add (std::shared_ptr<DKDMBase> child, std::shared_ptr<DKDM> previous = std::shared_ptr<DKDM>());
         void remove (std::shared_ptr<DKDMBase> child);
 
 private:
 	std::string _name;
-	std::list<std::shared_ptr<DKDMBase> > _children;
+	std::list<std::shared_ptr<DKDMBase>> _children;
 };
diff --git a/src/lib/film.cc b/src/lib/film.cc
index c57fc165c..7f6f8e498 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -284,13 +284,13 @@ Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
 	auto p = dir ("analysis");
 
 	Digester digester;
-	for (auto i: playlist->content ()) {
+	for (auto i: playlist->content()) {
 		if (!i->audio) {
 			continue;
 		}
 
-		digester.add (i->digest ());
-		digester.add (i->audio->mapping().digest ());
+		digester.add (i->digest());
+		digester.add (i->audio->mapping().digest());
 		if (playlist->content().size() != 1) {
 			/* Analyses should be considered equal regardless of gain
 			   if they were made from just one piece of content.  This
@@ -298,7 +298,7 @@ Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const
 			   analysis at the plotting stage rather than having to
 			   recompute it.
 			*/
-			digester.add (i->audio->gain ());
+			digester.add (i->audio->gain());
 		}
 	}
 
diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index 729e9a867..e9dcfac34 100644
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -125,7 +125,7 @@ Hints::check_incorrect_container ()
 	int scope = 0;
 	for (auto i: film()->content()) {
 		if (i->video) {
-			Ratio const * r = Ratio::nearest_from_ratio(i->video->scaled_size(film()->frame_size()).ratio());
+			auto const r = Ratio::nearest_from_ratio(i->video->scaled_size(film()->frame_size()).ratio());
 			if (r && r->id() == "239") {
 				++scope;
 			} else if (r && r->id() != "239" && r->id() != "235" && r->id() != "190") {