projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: use bitmap_path().
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_server.cc
diff --git
a/src/tools/dcpomatic_server.cc
b/src/tools/dcpomatic_server.cc
index 696fec09ae1b37c73071b9707e204ac0f3a55f79..be0f05ea1f9f9ffc78d0e4f5ba1afdc6372b49e8 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 <wx/icon.h>
DCPOMATIC_ENABLE_WARNINGS
#include <boost/thread.hpp>
-#include <boost/foreach.hpp>
#include <boost/optional.hpp>
#include <iostream>
#include <boost/optional.hpp>
#include <iostream>
@@
-46,11
+45,11
@@
using std::exception;
using std::list;
using std::fixed;
using std::setprecision;
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::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
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
@@
-72,7
+71,7
@@
public:
string get () const {
string a;
string get () const {
string a;
-
BOOST_FOREACH (string const & i,
_log) {
+
for (auto const& i:
_log) {
a += i + "\n";
}
return a;
a += i + "\n";
}
return a;
@@
-206,7
+205,7
@@
private:
wxTextCtrl* _text;
wxStaticText* _fps;
wxTextCtrl* _text;
wxStaticText* _fps;
-
boost
::shared_ptr<wxTimer> _timer;
+
std
::shared_ptr<wxTimer> _timer;
};
class TaskBarIcon : public wxTaskBarIcon
};
class TaskBarIcon : public wxTaskBarIcon
@@
-218,7
+217,7
@@
public:
#ifdef DCPOMATIC_WINDOWS
wxIcon icon (std_to_wx ("id"));
#else
#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 (
bitmap_path("dcpomatic_small"
), wxBITMAP_TYPE_PNG);
wxIcon icon;
icon.CopyFromBitmap (bitmap);
#endif
wxIcon icon;
icon.CopyFromBitmap (bitmap);
#endif