Tidying.

[libdcp.git] / src / interop_load_font_node.cc

diff --git a/src/interop_load_font_node.cc b/src/interop_load_font_node.cc
index a5bc14286e9bf6e2bb426527393575e9cb8d4024..40f12dde74ab50b6c6c9bea40500cb7e7c713684 100644 (file)
--- a/src/interop_load_font_node.cc
+++ b/src/interop_load_font_node.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,14 +31,22 @@
     files in the program, then also delete it here.
 */
 
+
+/** @file  src/interop_load_font_node.cc
+ *  @brief InteropLoadFontNode class
+ */
+
+
 #include "interop_load_font_node.h"
 #include <libcxml/cxml.h>
 
+
 using std::string;
 using std::shared_ptr;
 using boost::optional;
 using namespace dcp;
 
+
 InteropLoadFontNode::InteropLoadFontNode (string id_, string uri_)
        : LoadFontNode (id_)
        , uri (uri_)
@@ -46,23 +54,26 @@ InteropLoadFontNode::InteropLoadFontNode (string id_, string uri_)
 
 }
 
+
 InteropLoadFontNode::InteropLoadFontNode (cxml::ConstNodePtr node)
 {
-       optional<string> x = node->optional_string_attribute ("Id");
+       auto x = node->optional_string_attribute("Id");
        if (!x) {
-               x = node->optional_string_attribute ("ID");
+               x = node->optional_string_attribute("ID");
        }
        id = x.get_value_or ("");
 
        uri = node->string_attribute ("URI");
 }
 
+
 bool
 dcp::operator== (InteropLoadFontNode const & a, InteropLoadFontNode const & b)
 {
        return a.id == b.id && a.uri == b.uri;
 }
 
+
 bool
 dcp::operator!= (InteropLoadFontNode const & a, InteropLoadFontNode const & b)
 {