C++11 tidying.

diff --git a/src/lib/content_text.h b/src/lib/content_text.h
index 438a76a6e17870fe2b7f52e4a52d51515c71125a..d32e880eedac9f25cd5e50e16620e16e4c41be04 100644 (file)
--- 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 d3e9b564b389fcb8787397ff43cefd6660ae1382..66bedecf51007c9e030cf3f01d3261ecc5eb5dfa 100644 (file)
--- 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;