BOOST_FOREACH.
[dcpomatic.git] / src / wx / hints_dialog.cc
index c98cbae07b2c16bb9e2b002706212cac13c5b557..2c6bac14a0ae0013525eda7c25187176c0c90bd0 100644 (file)
 DCPOMATIC_DISABLE_WARNINGS
 #include <wx/richtext/richtextctrl.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <boost/foreach.hpp>
 
 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)
@@ -79,7 +81,7 @@ HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film, bool ok)
 
        _text->GetCaret()->Hide ();
 
-       boost::shared_ptr<Film> locked_film = _film.lock ();
+       std::shared_ptr<Film> 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));
@@ -98,7 +100,7 @@ HintsDialog::film_change (ChangeType type)
        _text->Clear ();
        _current.clear ();
 
-       boost::shared_ptr<Film> film = _film.lock ();
+       std::shared_ptr<Film> film = _film.lock ();
        if (!film) {
                return;
        }
@@ -136,7 +138,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 ();
                }