BOOST_FOREACH.

11 files changed, 34 insertions, 42 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 386e40cb2..bcef19f59 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -103,7 +103,6 @@ DCPOMATIC_ENABLE_WARNINGS
 #endif
 #include <boost/filesystem.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 #include <iostream>
 #include <fstream>
@@ -445,7 +444,7 @@ public:
 				);
 		}
 
-		BOOST_FOREACH (string i, notes) {
+		for (auto i: notes) {
 			error_dialog (0, std_to_wx(i));
 		}
 
@@ -687,7 +686,7 @@ private:
 
 		PasteDialog* d = new PasteDialog (this, static_cast<bool>(_clipboard->video), static_cast<bool>(_clipboard->audio), !_clipboard->text.empty());
 		if (d->ShowModal() == wxID_OK) {
-			BOOST_FOREACH (shared_ptr<Content> i, _film_editor->content_panel()->selected()) {
+			for (auto i: _film_editor->content_panel()->selected()) {
 				if (d->video() && i->video) {
 					DCPOMATIC_ASSERT (_clipboard->video);
 					i->video->take_settings_from (_clipboard->video);
@@ -1638,7 +1637,7 @@ private:
 			if (!_film_to_create.empty ()) {
 				_frame->new_film (_film_to_create, optional<string> ());
 				if (!_content_to_add.empty ()) {
-					BOOST_FOREACH (shared_ptr<Content> i, content_factory(_content_to_add)) {
+					for (auto i: content_factory(_content_to_add)) {
 						_frame->film()->examine_and_add_content (i);
 					}
 				}
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 46c66d2c9..9cb6ddc55 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -40,7 +40,6 @@
 #include <wx/splash.h>
 #include <wx/preferences.h>
 #include <wx/wx.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 #include <set>
 
@@ -179,13 +178,13 @@ public:
 
 			set<shared_ptr<const Film> > films;
 
-			BOOST_FOREACH (shared_ptr<Job> i, JobManager::instance()->get()) {
+			for (auto i: JobManager::instance()->get()) {
 				films.insert (i->film());
 			}
 
-			BOOST_FOREACH (shared_ptr<const Film> i, films) {
+			for (auto i: films) {
 				double progress = 0;
-				BOOST_FOREACH (shared_ptr<Job> j, JobManager::instance()->get()) {
+				for (auto j: JobManager::instance()->get()) {
 					if (i == j->film() && dynamic_pointer_cast<TranscodeJob>(j)) {
 						progress = j->progress().get_value_or(0);
 					}
@@ -438,7 +437,7 @@ class App : public wxApp
 		this->Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
 
 		shared_ptr<Film> film;
-		BOOST_FOREACH (boost::filesystem::path i, films_to_load) {
+		for (auto i: films_to_load) {
 			if (boost::filesystem::is_directory (i)) {
 				try {
 					film.reset (new Film (i));
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 2d70fb578..46ae790cc 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -35,7 +35,6 @@
 #include "lib/audio_content.h"
 #include "lib/dcpomatic_log.h"
 #include <dcp/version.h>
-#include <boost/foreach.hpp>
 #include <getopt.h>
 #include <iostream>
 #include <iomanip>
@@ -82,7 +81,7 @@ print_dump (shared_ptr<Film> film)
 	     << "Output " << film->video_frame_rate() << "fps " << (film->three_d() ? "3D" : "2D") << " " << (film->audio_frame_rate() / 1000) << "kHz\n"
 	     << (film->interop() ? "Inter-Op" : "SMPTE") << " " << (film->encrypted() ? "encrypted" : "unencrypted") << "\n";
 
-	BOOST_FOREACH (shared_ptr<Content> c, film->content ()) {
+	for (auto c: film->content()) {
 		cout << "\n"
 		     << c->path(0) << "\n"
 		     << "\tat " << c->position().seconds ()
@@ -140,7 +139,7 @@ list_servers ()
 			++N;
 
 			/* Report the state of configured servers */
-			BOOST_FOREACH (string i, Config::instance()->servers()) {
+			for (auto i: Config::instance()->servers()) {
 				cout << std::left << setw(24) << i << " ";
 
 				/* See if this server is on the active list; if so, remove it and note
@@ -168,7 +167,7 @@ list_servers ()
 			}
 
 			/* Now report any left that have been found by broadcast */
-			BOOST_FOREACH (EncodeServerDescription const & i, servers) {
+			for (auto const& i: servers) {
 				if (i.current_link_version()) {
 					cout << std::left << setw(24) << i.host_name() << " UP     " << i.threads() << "\n";
 				} else {
diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 568dfa56c..1d3387f18 100644
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -38,7 +38,6 @@
 #include <dcp/exceptions.h>
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <getopt.h>
 #include <string>
 #include <iostream>
@@ -111,7 +110,7 @@ main (int argc, char* argv[])
 			film->set_j2k_bandwidth (*cc.j2k_bandwidth);
 		}
 
-		BOOST_FOREACH (CreateCLI::Content i, cc.content) {
+		for (auto i: cc.content) {
 			boost::filesystem::path const can = boost::filesystem::canonical (i.path);
 			list<shared_ptr<Content> > content;
 
@@ -122,7 +121,7 @@ main (int argc, char* argv[])
 				content = content_factory (can);
 			}
 
-			BOOST_FOREACH (shared_ptr<Content> j, content) {
+			for (auto j: content) {
 				film->examine_and_add_content (j);
 			}
 
@@ -132,7 +131,7 @@ main (int argc, char* argv[])
 
 			while (signal_manager->ui_idle() > 0) {}
 
-			BOOST_FOREACH (shared_ptr<Content> j, content) {
+			for (auto j: content) {
 				if (j->video) {
 					j->video->set_frame_type (i.frame_type);
 				}
@@ -143,7 +142,7 @@ main (int argc, char* argv[])
 			film->set_video_frame_rate (*cc.dcp_frame_rate);
 		}
 
-		BOOST_FOREACH (shared_ptr<Content> i, film->content()) {
+		for (auto i: film->content()) {
 			shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
 			if (ic && ic->still()) {
 				ic->video->set_length (cc.still_length * 24);
@@ -151,7 +150,7 @@ main (int argc, char* argv[])
 		}
 
 		if (jm->errors ()) {
-			BOOST_FOREACH (shared_ptr<Job> i, jm->get()) {
+			for (auto i: jm->get()) {
 				if (i->finished_in_error()) {
 					cerr << i->error_summary() << "\n"
 					     << i->error_details() << "\n";
diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index ac0bb68df..17a24d4c1 100644
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -317,7 +317,7 @@ private:
 		int re_select = wxNOT_FOUND;
 		int j = 0;
 		_drives = Drive::get ();
-		BOOST_FOREACH (Drive i, _drives) {
+		for (auto i: _drives) {
 			wxString const s = std_to_wx(i.description());
 			if (s == current) {
 				re_select = j;
diff --git a/src/tools/dcpomatic_disk_writer.cc b/src/tools/dcpomatic_disk_writer.cc
index 695a0b033..6c4221d8a 100644
--- a/src/tools/dcpomatic_disk_writer.cc
+++ b/src/tools/dcpomatic_disk_writer.cc
@@ -64,7 +64,6 @@ DCPOMATIC_ENABLE_WARNINGS
 #include <sys/types.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 using std::cin;
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 874573ce2..3547d0f59 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -59,7 +59,6 @@ DCPOMATIC_ENABLE_WARNINGS
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 #include <boost/bind/bind.hpp>
-#include <boost/foreach.hpp>
 
 #ifdef check
 #undef check
@@ -321,7 +320,7 @@ private:
 					throw InvalidSignerError ();
 				}
 
-				BOOST_FOREACH (shared_ptr<Screen> i, _screens->screens()) {
+				for (auto i: _screens->screens()) {
 
 					if (!i->recipient) {
 						continue;
@@ -340,7 +339,7 @@ private:
 						);
 
 					/* Add keys from the DKDM */
-					BOOST_FOREACH (dcp::DecryptedKDMKey const & j, decrypted.keys()) {
+					for (auto const& j: decrypted.keys()) {
 						kdm.add_key (j);
 					}
 
@@ -522,7 +521,7 @@ private:
 		/* Add children */
 		shared_ptr<DKDMGroup> g = dynamic_pointer_cast<DKDMGroup> (base);
 		if (g) {
-			BOOST_FOREACH (shared_ptr<DKDMBase> i, g->children()) {
+			for (auto i: g->children()) {
 				add_dkdm_view (i);
 			}
 		}
diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index fef5dea04..d0ee0cad9 100644
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -226,7 +226,7 @@ from_film (
 
 	try {
 		list<KDMWithMetadataPtr> kdms;
-		BOOST_FOREACH (shared_ptr<Screen> i, screens) {
+		for (auto i: screens) {
 			KDMWithMetadataPtr p = kdm_for_screen (film, cpl, i, valid_from, valid_to, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio);
 			if (p) {
 				kdms.push_back (p);
@@ -248,7 +248,7 @@ from_film (
 optional<dcp::EncryptedKDM>
 sub_find_dkdm (shared_ptr<DKDMGroup> group, string cpl_id)
 {
-	BOOST_FOREACH (shared_ptr<DKDMBase> i, group->children()) {
+	for (auto i: group->children()) {
 		shared_ptr<DKDMGroup> g = dynamic_pointer_cast<DKDMGroup>(i);
 		if (g) {
 			optional<dcp::EncryptedKDM> dkdm = sub_find_dkdm (g, cpl_id);
@@ -300,7 +300,7 @@ kdm_from_dkdm (
 		dcp::LocalTime().as_string()
 		);
 
-	BOOST_FOREACH (dcp::DecryptedKDMKey const & j, dkdm.keys()) {
+	for (auto const& j: dkdm.keys()) {
 		kdm.add_key(j);
 	}
 
@@ -327,7 +327,7 @@ from_dkdm (
 
 	try {
 		list<KDMWithMetadataPtr> kdms;
-		BOOST_FOREACH (shared_ptr<Screen> i, screens) {
+		for (auto i: screens) {
 			if (!i->recipient) {
 				continue;
 			}
@@ -375,7 +375,7 @@ dump_dkdm_group (shared_ptr<DKDMGroup> group, int indent)
 		}
 		cout << group->name() << "\n";
 	}
-	BOOST_FOREACH (shared_ptr<DKDMBase> i, group->children()) {
+	for (auto i: group->children()) {
 		shared_ptr<DKDMGroup> g = dynamic_pointer_cast<DKDMGroup>(i);
 		if (g) {
 			dump_dkdm_group (g, indent + 2);
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 5b2c9a56a..0586db975 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -278,7 +278,7 @@ public:
 		}
 
 		bool ok = true;
-		BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
+		for (auto i: _film->content()) {
 			shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent>(i);
 			if (d && !d->kdm_timing_window_valid()) {
 				ok = false;
@@ -303,7 +303,7 @@ public:
 		if (dcp) {
 			DCPExaminer ex (dcp, true);
 			shared_ptr<dcp::CPL> playing_cpl;
-			BOOST_FOREACH (shared_ptr<dcp::CPL> i, ex.cpls()) {
+			for (auto i: ex.cpls()) {
 				if (!dcp->cpl() || i->id() == *dcp->cpl()) {
 					playing_cpl = i;
 				}
@@ -415,10 +415,10 @@ public:
 		/* Start off as Flat */
 		_film->set_container (Ratio::from_id("185"));
 
-		BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
+		for (auto i: _film->content()) {
 			shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(i);
 
-			BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+			for (auto j: i->text) {
 				j->set_use (true);
 			}
 
@@ -452,7 +452,7 @@ public:
 			if (first) {
 				DCPExaminer ex (first, true);
 				int id = ID_view_cpl;
-				BOOST_FOREACH (shared_ptr<dcp::CPL> i, ex.cpls()) {
+				for (auto i: ex.cpls()) {
 					wxMenuItem* j = _cpl_menu->AppendRadioItem(
 						id,
 						wxString::Format("%s (%s)", std_to_wx(i->annotation_text()).data(), std_to_wx(i->id()).data())
@@ -612,7 +612,7 @@ private:
 			if (!ok || !report_errors_from_last_job(this)) {
 				return;
 			}
-			BOOST_FOREACH (shared_ptr<TextContent> i, dcp->text) {
+			for (auto i: dcp->text) {
 				i->set_use (true);
 			}
 			if (dcp->video) {
diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index 261f08972..1dca8c182 100644
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -36,7 +36,6 @@
 #include <wx/imaglist.h>
 #include <wx/spinctrl.h>
 #include <wx/preferences.h>
-#include <boost/foreach.hpp>
 
 using std::exception;
 using std::cout;
@@ -171,7 +170,7 @@ private:
 		}
 
 		int N = 0;
-		BOOST_FOREACH (shared_ptr<SignalSPL> i, _playlists) {
+		for (auto i: _playlists) {
 			if (i == playlist) {
 				_list->SetItem (N, 0, std_to_wx(i->name()));
 			}
@@ -196,7 +195,7 @@ private:
 			} catch (...) {}
 		}
 
-		BOOST_FOREACH (shared_ptr<SignalSPL> i, _playlists) {
+		for (auto i: _playlists) {
 			add_playlist_to_view (i);
 		}
 	}
@@ -318,7 +317,7 @@ public:
 		_playlist = playlist;
 		_list->DeleteAllItems ();
 		if (_playlist) {
-			BOOST_FOREACH (SPLEntry i, _playlist->get()) {
+			for (auto i: _playlist->get()) {
 				add (i);
 			}
 			_name->SetValue (std_to_wx(_playlist->name()));
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index c59fefe8f..4039a07ed 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -36,7 +36,6 @@ DCPOMATIC_DISABLE_WARNINGS
 #include <wx/icon.h>
 DCPOMATIC_ENABLE_WARNINGS
 #include <boost/thread.hpp>
-#include <boost/foreach.hpp>
 #include <boost/optional.hpp>
 #include <iostream>
 
@@ -72,7 +71,7 @@ public:
 
 	string get () const {
 		string a;
-		BOOST_FOREACH (string const & i, _log) {
+		for (auto const& i: _log) {
 			a += i + "\n";
 		}
 		return a;