projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libdcp's warnings.h
[dcpomatic.git]
/
src
/
wx
/
dkdm_output_panel.cc
diff --git
a/src/wx/dkdm_output_panel.cc
b/src/wx/dkdm_output_panel.cc
index cf6189efa7192a961f5727a224441ef543fb9fe4..5b04f740a4a2ab3db6acf7bb70f32e9454c60cc9 100644
(file)
--- a/
src/wx/dkdm_output_panel.cc
+++ b/
src/wx/dkdm_output_panel.cc
@@
-18,34
+18,36
@@
*/
*/
-#include "lib/config.h"
-#include "lib/send_kdm_email_job.h"
-#include "lib/warnings.h"
+
+#include "check_box.h"
+#include "confirm_kdm_email_dialog.h"
+#include "dcpomatic_button.h"
#include "dkdm_output_panel.h"
#include "kdm_timing_panel.h"
#include "dkdm_output_panel.h"
#include "kdm_timing_panel.h"
-#include "confirm_kdm_email_dialog.h"
-#include "wx_util.h"
#include "name_format_editor.h"
#include "name_format_editor.h"
-#include "check_box.h"
-#include "dcpomatic_button.h"
+#include "wx_util.h"
+#include "lib/config.h"
+#include "lib/send_kdm_email_job.h"
#include <dcp/exceptions.h>
#include <dcp/types.h>
#include <dcp/exceptions.h>
#include <dcp/types.h>
+#include <dcp/warnings.h>
#ifdef DCPOMATIC_USE_OWN_PICKER
#include "dir_picker_ctrl.h"
#else
#ifdef DCPOMATIC_USE_OWN_PICKER
#include "dir_picker_ctrl.h"
#else
-
DCPOMATIC
_DISABLE_WARNINGS
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/filepicker.h>
#include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
-#endif
#include <wx/stdpaths.h>
#include <wx/stdpaths.h>
+LIBDCP_ENABLE_WARNINGS
+#endif
+
-using std::pair;
-using std::string;
-using std::list;
using std::exception;
using std::exception;
+using std::function;
+using std::list;
using std::make_pair;
using std::make_pair;
+using std::pair;
using std::shared_ptr;
using std::shared_ptr;
-using std::
function
;
+using std::
string
;
DKDMOutputPanel::DKDMOutputPanel (wxWindow* parent)
DKDMOutputPanel::DKDMOutputPanel (wxWindow* parent)