From: Carl Hetherington <cth@carlh.net>
Date: Tue, 31 May 2022 13:55:20 +0000 (+0200)
Subject: C++11 tidying.
X-Git-Tag: v2.16.14~34
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=9b92e596727bcbab5df68ed72ddf59702a4a9702

C++11 tidying.
---

diff --git a/src/lib/content_text.h b/src/lib/content_text.h
index 438a76a6e..d32e880ee 100644
--- a/src/lib/content_text.h
+++ b/src/lib/content_text.h
@@ -18,18 +18,22 @@
 
 */
 
+
 #ifndef DCPOMATIC_CONTENT_TEXT_H
 #define DCPOMATIC_CONTENT_TEXT_H
 
+
+#include "bitmap_text.h"
 #include "dcpomatic_time.h"
 #include "rect.h"
 #include "types.h"
-#include "bitmap_text.h"
 #include <dcp/subtitle_string.h>
 #include <list>
 
+
 class Image;
 
+
 class ContentText
 {
 public:
@@ -78,4 +82,5 @@ public:
 	std::list<dcp::SubtitleString> subs;
 };
 
+
 #endif
diff --git a/src/lib/text_content.h b/src/lib/text_content.h
index d3e9b564b..66bedecf5 100644
--- a/src/lib/text_content.h
+++ b/src/lib/text_content.h
@@ -132,7 +132,7 @@ public:
 		return _y_scale;
 	}
 
-	std::list<std::shared_ptr<dcpomatic::Font> > fonts () const {
+	std::list<std::shared_ptr<dcpomatic::Font>> fonts () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _fonts;
 	}
@@ -221,7 +221,7 @@ private:
 	double _x_scale;
 	/** y scale factor to apply to subtitles */
 	double _y_scale;
-	std::list<std::shared_ptr<dcpomatic::Font> > _fonts;
+	std::list<std::shared_ptr<dcpomatic::Font>> _fonts;
 	boost::optional<dcp::Colour> _colour;
 	boost::optional<dcp::Effect> _effect;
 	boost::optional<dcp::Colour> _effect_colour;