X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_cpl_panel.cc;h=be5e42dd8b9458a490b967027928c9982ffd5d6d;hb=bac6ee64d3302977144208a82a8b11824cb328dc;hp=241b3880ce9e179aceac6adc35a87cb6a79dd238;hpb=1dfb125a8e07f5185c229260ac0643e47eee5026;p=dcpomatic.git

diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc
index 241b3880c..be5e42dd8 100644
--- a/src/wx/kdm_cpl_panel.cc
+++ b/src/wx/kdm_cpl_panel.cc
@@ -27,7 +27,6 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 DCPOMATIC_ENABLE_WARNINGS
 #include <libcxml/cxml.h>
-#include <boost/foreach.hpp>
 
 using std::vector;
 
@@ -43,7 +42,7 @@ KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector<CPLSummary> cpls)
 	_cpl = new wxChoice (this, wxID_ANY);
 	s->Add (_cpl, 1, wxEXPAND);
 	_cpl_browse = new Button (this, _("Browse..."));
-	s->Add (_cpl_browse, 0, wxALIGN_CENTER_VERTICAL);
+	s->Add (_cpl_browse, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
 	vertical->Add (s, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2);
 
 	/* CPL details */
@@ -72,7 +71,7 @@ KDMCPLPanel::update_cpl_choice ()
 {
 	_cpl->Clear ();
 
-	BOOST_FOREACH (CPLSummary const & i, _cpls) {
+	for (auto const& i: _cpls) {
 		_cpl->Append (std_to_wx(i.cpl_id));
 
 		if (_cpls.size() > 0) {
@@ -116,10 +115,10 @@ KDMCPLPanel::cpl_browse_clicked ()
 		cpl_document.read_file (cpl_file);
 
 		bool encrypted = false;
-		BOOST_FOREACH (cxml::ConstNodePtr i, cpl_document.node_children("ReelList")) {
-			BOOST_FOREACH (cxml::ConstNodePtr j, i->node_children("Reel")) {
-				BOOST_FOREACH (cxml::ConstNodePtr k, j->node_children("AssetList")) {
-					BOOST_FOREACH (cxml::ConstNodePtr l, k->node_children()) {
+		for (auto i: cpl_document.node_children("ReelList")) {
+			for (auto j: i->node_children("Reel")) {
+				for (auto k: j->node_children("AssetList")) {
+					for (auto l: k->node_children()) {
 						if (!l->node_children("KeyId").empty()) {
 							encrypted = true;
 						}