C++11 tidying.

[dcpomatic.git] / src / lib / font.cc

diff --git a/src/lib/font.cc b/src/lib/font.cc
index 309f3d1eb3a6eab77673d75b5d58802b9c376a6e..a2dc1945f009a8facb973bd5eec19d51f256e373 100644 (file)
--- a/src/lib/font.cc
+++ b/src/lib/font.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,68 +18,54 @@
 
 */
 
-#include "font.h"
+
 #include "dcpomatic_assert.h"
+#include "font.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
+DCPOMATIC_ENABLE_WARNINGS
+
 
 using std::string;
+using namespace dcpomatic;
 
-static char const * names[] = {
-       "Normal",
-       "Italic",
-       "Bold"
-};
 
 Font::Font (cxml::NodePtr node)
-       : _id (node->string_child ("Id"))
+       : _id (node->string_child("Id"))
 {
-       DCPOMATIC_ASSERT (FontFiles::VARIANTS == 3);
-
-       BOOST_FOREACH (cxml::NodePtr i, node->node_children ("File")) {
-               string variant = i->optional_string_attribute("Variant").get_value_or ("Normal");
-               for (int j = 0; j < FontFiles::VARIANTS; ++j) {
-                       if (variant == names[j]) {
-                               _files.set (static_cast<FontFiles::Variant>(j), i->content());
-                       }
+       for (auto i: node->node_children("File")) {
+               string variant = i->optional_string_attribute("Variant").get_value_or("Normal");
+               if (variant == "Normal") {
+                       _file = i->content();
                }
        }
 }
 
+
 void
 Font::as_xml (xmlpp::Node* node)
 {
-       DCPOMATIC_ASSERT (FontFiles::VARIANTS == 3);
-
-       node->add_child("Id")->add_child_text (_id);
-       for (int i = 0; i < FontFiles::VARIANTS; ++i) {
-               if (_files.get(static_cast<FontFiles::Variant>(i))) {
-                       xmlpp::Element* e = node->add_child ("File");
-                       e->set_attribute ("Variant", names[i]);
-                       e->add_child_text (_files.get(static_cast<FontFiles::Variant>(i)).get().string ());
-               }
+       node->add_child("Id")->add_child_text(_id);
+       if (_file) {
+               node->add_child("File")->add_child_text(_file->string());
        }
 }
 
 
 bool
-operator== (Font const & a, Font const & b)
+dcpomatic::operator== (Font const & a, Font const & b)
 {
        if (a.id() != b.id()) {
                return false;
        }
 
-       for (int i = 0; i < FontFiles::VARIANTS; ++i) {
-               if (a.file(static_cast<FontFiles::Variant>(i)) != b.file(static_cast<FontFiles::Variant>(i))) {
-                       return false;
-               }
-       }
-
-       return true;
+       return a.file() == b.file();
 }
 
+
 bool
-operator!= (Font const & a, Font const & b)
+dcpomatic::operator!= (Font const & a, Font const & b)
 {
        return !(a == b);
 }