X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Flanguage_tag_dialog.cc;h=d9add6dcae38b4ff942a673f26444997a085f625;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=245dee2dbf37551becced762afc8bd31d1585af2;hpb=bd7f4bbde17d2087ba4c4bddf6439b3df869b1db;p=dcpomatic.git

diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc
index 245dee2db..d9add6dca 100644
--- a/src/wx/language_tag_dialog.cc
+++ b/src/wx/language_tag_dialog.cc
@@ -27,9 +27,7 @@
 #include <wx/wx.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/bind/bind.hpp>
-#include <boost/foreach.hpp>
 #include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <iostream>
 #include <iterator>
@@ -42,8 +40,8 @@ using std::pair;
 using std::string;
 using std::vector;
 using boost::optional;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -86,7 +84,7 @@ public:
 			_matching_subtags.clear ();
 
 			boost::algorithm::to_lower(search);
-			BOOST_FOREACH (dcp::LanguageTag::SubtagData const& i, _all_subtags) {
+			for (auto const& i: _all_subtags) {
 				if (
 					(boost::algorithm::to_lower_copy(i.subtag).find(search) != string::npos) ||
 					(boost::algorithm::to_lower_copy(i.description).find(search) != string::npos)) {
@@ -263,7 +261,7 @@ dcp::LanguageTag LanguageTagDialog::get () const
 	vector<dcp::LanguageTag::VariantSubtag> variants;
 	vector<dcp::LanguageTag::ExtlangSubtag> extlangs;
 
-	BOOST_FOREACH (Subtag i, _current_tag_subtags) {
+	for (auto i: _current_tag_subtags) {
 		if (!i.subtag) {
 			continue;
 		}
@@ -402,7 +400,7 @@ LanguageTagDialog::setup_sensitivity ()
 	_add_region->Enable ();
 	_add_variant->Enable ();
 	_add_external->Enable ();
-	BOOST_FOREACH (Subtag const& i, _current_tag_subtags) {
+	for (auto const& i: _current_tag_subtags) {
 		switch (i.type) {
 			case dcp::LanguageTag::SCRIPT:
 				_add_script->Enable (false);