BOOST_FOREACH.

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

diff --git a/src/lib/font.cc b/src/lib/font.cc
index 333539aa4b7cbc6441dbc2e5c75dae4d0f7752a3..aa9a8aaef7bc39d556f9377351a83cc0a2fbd401 100644 (file)
--- a/src/lib/font.cc
+++ b/src/lib/font.cc
@@ -20,15 +20,18 @@
 
 #include "font.h"
 #include "dcpomatic_assert.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::string;
+using namespace dcpomatic;
 
 Font::Font (cxml::NodePtr node)
        : _id (node->string_child ("Id"))
 {
-       BOOST_FOREACH (cxml::NodePtr i, node->node_children("File")) {
+       for (auto i: node->node_children("File")) {
                string variant = i->optional_string_attribute("Variant").get_value_or ("Normal");
                if (variant == "Normal") {
                        _file = i->content();
@@ -47,7 +50,7 @@ Font::as_xml (xmlpp::Node* node)
 
 
 bool
-operator== (Font const & a, Font const & b)
+dcpomatic::operator== (Font const & a, Font const & b)
 {
        if (a.id() != b.id()) {
                return false;
@@ -57,7 +60,7 @@ operator== (Font const & a, Font const & b)
 }
 
 bool
-operator!= (Font const & a, Font const & b)
+dcpomatic::operator!= (Font const & a, Font const & b)
 {
        return !(a == b);
 }