BOOST_FOREACH.

[dcpomatic.git] / src / tools / dcpomatic_server.cc

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index a4ef0bc62a28ec8f37fd28b6cd7a3919173992fc..4039a07ed3702e67df0bc3370386b95a64fe6312 100644 (file)
--- 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>
 
@@ -46,11 +45,14 @@ using std::exception;
 using std::list;
 using std::fixed;
 using std::setprecision;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::thread;
 using boost::bind;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 enum {
        ID_status = 1,
@@ -69,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;
@@ -203,7 +205,7 @@ private:
 
        wxTextCtrl* _text;
        wxStaticText* _fps;
-       boost::shared_ptr<wxTimer> _timer;
+       std::shared_ptr<wxTimer> _timer;
 };
 
 class TaskBarIcon : public wxTaskBarIcon
@@ -215,7 +217,7 @@ public:
 #ifdef DCPOMATIC_WINDOWS
                wxIcon icon (std_to_wx ("id"));
 #else
-               wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+               wxBitmap bitmap (wxString::Format(wxT("%s/dcpomatic_small.png"), std_to_wx(resources_path().string())), wxBITMAP_TYPE_PNG);
                wxIcon icon;
                icon.CopyFromBitmap (bitmap);
 #endif