projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidying.
[dcpomatic.git]
/
src
/
wx
/
full_language_tag_dialog.cc
diff --git
a/src/wx/full_language_tag_dialog.cc
b/src/wx/full_language_tag_dialog.cc
index a6d5e49a65de69ef0201a26171936ce6ac2d6b05..df9a565b4d89c60a74b843fa644a81b5ca75ef93 100644
(file)
--- a/
src/wx/full_language_tag_dialog.cc
+++ b/
src/wx/full_language_tag_dialog.cc
@@
-19,8
+19,8
@@
*/
*/
-#include "lib/dcpomatic_assert.h"
#include "full_language_tag_dialog.h"
#include "full_language_tag_dialog.h"
+#include "lib/dcpomatic_assert.h"
#include <dcp/language_tag.h>
#include <wx/listctrl.h>
#include <wx/srchctrl.h>
#include <dcp/language_tag.h>
#include <wx/listctrl.h>
#include <wx/srchctrl.h>
@@
-29,7
+29,6
@@
#include <boost/bind/bind.hpp>
#include <boost/optional.hpp>
#include <boost/signals2.hpp>
#include <boost/bind/bind.hpp>
#include <boost/optional.hpp>
#include <boost/signals2.hpp>
-#include <iostream>
#include <iterator>
#include <string>
#include <vector>
#include <iterator>
#include <string>
#include <vector>
@@
-37,11
+36,11
@@
using std::min;
using std::pair;
using std::min;
using std::pair;
+using std::shared_ptr;
using std::string;
using std::vector;
using std::string;
using std::vector;
-using boost::optional;
-using std::shared_ptr;
using std::weak_ptr;
using std::weak_ptr;
+using boost::optional;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif