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 d5a8151d7497c8635c9fc16181ade918aafbca93..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.
 
@@ -16,16 +16,37 @@
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    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 boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using namespace dcp;
 
+
 InteropLoadFontNode::InteropLoadFontNode (string id_, string uri_)
        : LoadFontNode (id_)
        , uri (uri_)
@@ -33,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)
 {