diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-04-22 23:27:15 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-04-22 23:27:15 +0200 |
| commit | 3c29aa6531a4046a8db72dcac81189eb8893233c (patch) | |
| tree | ce2a134dab63df1711a135ae5732839ff293d958 /src/wx/dkdm_output_panel.cc | |
| parent | 92364afecf76a87e1f96980cb1b91cf6f6a7522c (diff) | |
Use libdcp's warnings.h
Diffstat (limited to 'src/wx/dkdm_output_panel.cc')
| -rw-r--r-- | src/wx/dkdm_output_panel.cc | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/wx/dkdm_output_panel.cc b/src/wx/dkdm_output_panel.cc index cf6189efa..5b04f740a 100644 --- 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 "confirm_kdm_email_dialog.h" -#include "wx_util.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/warnings.h> #ifdef DCPOMATIC_USE_OWN_PICKER #include "dir_picker_ctrl.h" #else -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include <wx/filepicker.h> -DCPOMATIC_ENABLE_WARNINGS -#endif #include <wx/stdpaths.h> +LIBDCP_ENABLE_WARNINGS +#endif + -using std::pair; -using std::string; -using std::list; using std::exception; +using std::function; +using std::list; using std::make_pair; +using std::pair; using std::shared_ptr; -using std::function; +using std::string; DKDMOutputPanel::DKDMOutputPanel (wxWindow* parent) |