C++11 tidying.

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

diff --git a/src/lib/cross_common.cc b/src/lib/cross_common.cc
index 07e37343628214c7a04a5430e5b2b25bbe084f86..2e48bf3e015131fab22094fea7a46b80f028325f 100644 (file)
--- a/src/lib/cross_common.cc
+++ b/src/lib/cross_common.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,24 +18,29 @@
 
 */
 
+
 #include "cross.h"
 #include "compose.hpp"
 #include "dcpomatic_log.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
-#include <boost/foreach.hpp>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"
 
+
 using std::string;
 
+
 Drive::Drive (string xml)
 {
        cxml::Document doc;
        doc.read_string (xml);
        _device = doc.string_child("Device");
-       BOOST_FOREACH (cxml::ConstNodePtr i, doc.node_children("MountPoint")) {
+       for (auto i: doc.node_children("MountPoint")) {
                _mount_points.push_back (i->content());
        }
        _size = doc.number_child<uint64_t>("Size");
@@ -48,9 +53,9 @@ string
 Drive::as_xml () const
 {
        xmlpp::Document doc;
-       xmlpp::Element* root = doc.create_root_node ("Drive");
+       auto root = doc.create_root_node ("Drive");
        root->add_child("Device")->add_child_text(_device);
-       BOOST_FOREACH (boost::filesystem::path i, _mount_points) {
+       for (auto i: _mount_points) {
                root->add_child("MountPoint")->add_child_text(i.string());
        }
        root->add_child("Size")->add_child_text(dcp::raw_convert<string>(_size));
@@ -61,7 +66,6 @@ Drive::as_xml () const
                root->add_child("Model")->add_child_text(*_model);
        }
 
-       std::cout << "xml is " << doc.write_to_string("UTF-8") << "\n";
        return doc.write_to_string("UTF-8");
 }
 
@@ -90,11 +94,12 @@ Drive::description () const
        return String::compose(_("%1 (%2 GB) [%3]"), name, gb, _device);
 }
 
+
 string
 Drive::log_summary () const
 {
        string mp;
-       BOOST_FOREACH (boost::filesystem::path i, _mount_points) {
+       for (auto i: _mount_points) {
                mp += i.string() + ",";
        }
        if (mp.empty()) {