projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1900aff
)
Cleanup: using/include sorting.
author
Carl Hetherington
<cth@carlh.net>
Thu, 11 Jan 2024 21:49:32 +0000
(22:49 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 11 Jan 2024 21:49:32 +0000
(22:49 +0100)
src/tools/dcpomatic_server.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_server.cc
b/src/tools/dcpomatic_server.cc
index e5e3a7e5a072e6a5838f8ff40e149cd49e3bae51..d93dec853dbff8e5f915933686389c8c6099344c 100644
(file)
--- a/
src/tools/dcpomatic_server.cc
+++ b/
src/tools/dcpomatic_server.cc
@@
-18,17
+18,17
@@
*/
*/
-#include "wx/wx_util.h"
-#include "wx/wx_signal_manager.h"
#include "wx/static_text.h"
#include "wx/static_text.h"
-#include "lib/util.h"
-#include "lib/encoded_log_entry.h"
-#include "lib/encode_server.h"
+#include "wx/wx_signal_manager.h"
+#include "wx/wx_util.h"
#include "lib/config.h"
#include "lib/config.h"
-#include "lib/log.h"
-#include "lib/signaller.h"
#include "lib/cross.h"
#include "lib/dcpomatic_log.h"
#include "lib/cross.h"
#include "lib/dcpomatic_log.h"
+#include "lib/encode_server.h"
+#include "lib/encoded_log_entry.h"
+#include "lib/log.h"
+#include "lib/signaller.h"
+#include "lib/util.h"
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
#include <wx/icon.h>
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
#include <wx/icon.h>
@@
-41,16
+41,16
@@
LIBDCP_ENABLE_WARNINGS
using std::cout;
using std::cout;
-using std::
string
;
+using std::
dynamic_pointer_cast
;
using std::exception;
using std::exception;
-using std::list;
using std::fixed;
using std::fixed;
+using std::list;
using std::setprecision;
using std::shared_ptr;
using std::setprecision;
using std::shared_ptr;
-using
boost::thread
;
+using
std::string
;
using boost::bind;
using boost::optional;
using boost::bind;
using boost::optional;
-using
std::dynamic_pointer_cast
;
+using
boost::thread
;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif