X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fhints_dialog.cc;h=7a44e22676b0305578052d4e1d287ed5b08f6376;hb=051dbf3c6b1518326ed6605df724c94d6cbee344;hp=c98cbae07b2c16bb9e2b002706212cac13c5b557;hpb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;p=dcpomatic.git

diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index c98cbae07..7a44e2267 100644
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "hints_dialog.h"
 #include "wx_util.h"
 #include "static_text.h"
@@ -25,28 +26,32 @@
 #include "lib/film.h"
 #include "lib/hints.h"
 #include "lib/config.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/richtext/richtextctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <boost/foreach.hpp>
+LIBDCP_ENABLE_WARNINGS
+
 
 using std::max;
 using std::vector;
 using std::string;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using boost::bind;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
-HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film, bool ok)
+
+HintsDialog::HintsDialog (wxWindow* parent, std::weak_ptr<Film> film, bool ok)
 	: wxDialog (parent, wxID_ANY, _("Hints"))
 	, _film (film)
 	, _hints (0)
 	, _finished (false)
 {
-	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+	auto sizer = new wxBoxSizer (wxVERTICAL);
 
 	_gauge = new wxGauge (this, wxID_ANY, 100);
 	sizer->Add (_gauge, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
@@ -57,12 +62,12 @@ HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film, bool ok)
 	sizer->Add (_text, 1, wxEXPAND | wxALL, 6);
 
 	if (!ok) {
-		wxCheckBox* b = new CheckBox (this, _("Don't show hints again"));
+		auto b = new CheckBox(this, _("Don't show hints again"));
 		sizer->Add (b, 0, wxALL, 6);
-		b->Bind (wxEVT_CHECKBOX, bind (&HintsDialog::shut_up, this, _1));
+		b->bind(&HintsDialog::shut_up, this, _1);
 	}
 
-	wxStdDialogButtonSizer* buttons = CreateStdDialogButtonSizer (0);
+	auto buttons = CreateStdDialogButtonSizer (0);
 	sizer->Add (CreateSeparatedSizer(buttons), wxSizerFlags().Expand().DoubleBorder());
 	if (ok) {
 		buttons->SetAffirmativeButton (new wxButton (this, wxID_OK));
@@ -79,26 +84,27 @@ HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film, bool ok)
 
 	_text->GetCaret()->Hide ();
 
-	boost::shared_ptr<Film> locked_film = _film.lock ();
+	auto locked_film = _film.lock ();
 	if (locked_film) {
 		_film_change_connection = locked_film->Change.connect (boost::bind (&HintsDialog::film_change, this, _1));
 		_film_content_change_connection = locked_film->ContentChange.connect (boost::bind (&HintsDialog::film_content_change, this, _1));
 	}
 
-	film_change (CHANGE_TYPE_DONE);
+	film_change (ChangeType::DONE);
 }
 
+
 void
 HintsDialog::film_change (ChangeType type)
 {
-	if (type != CHANGE_TYPE_DONE) {
+	if (type != ChangeType::DONE) {
 		return;
 	}
 
 	_text->Clear ();
 	_current.clear ();
 
-	boost::shared_ptr<Film> film = _film.lock ();
+	auto film = _film.lock ();
 	if (!film) {
 		return;
 	}
@@ -111,10 +117,10 @@ HintsDialog::film_change (ChangeType type)
 	_finished = false;
 
 	_hints.reset (new Hints (_film));
-	_hints->Hint.connect (bind (&HintsDialog::hint, this, _1));
-	_hints->Progress.connect (bind (&HintsDialog::progress, this, _1));
-	_hints->Pulse.connect (bind (&HintsDialog::pulse, this));
-	_hints->Finished.connect (bind (&HintsDialog::finished, this));
+	_hints_hint_connection = _hints->Hint.connect(bind(&HintsDialog::hint, this, _1));
+	_hints_progress_connection = _hints->Progress.connect(bind(&HintsDialog::progress, this, _1));
+	_hints_pulse_connection = _hints->Pulse.connect(bind(&HintsDialog::pulse, this));
+	_hints_finished_connection = _hints->Finished.connect(bind(&HintsDialog::finished, this));
 	_hints->start ();
 }
 
@@ -136,7 +142,7 @@ HintsDialog::update ()
 		}
 	} else {
 		_text->BeginStandardBullet (N_("standard/circle"), 1, 50);
-		BOOST_FOREACH (string i, _current) {
+		for (auto i: _current) {
 			_text->WriteText (std_to_wx (i));
 			_text->Newline ();
 		}