X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcinema_dialog.h;h=0b8362843de68f759c08a08c1b0aae8367b0d093;hp=32dd77264e07e9c5b56b64ec009bfa168db93f7d;hb=9f125fddff88bf62d36381f9d3f09e5240b033d5;hpb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af diff --git a/src/wx/cinema_dialog.h b/src/wx/cinema_dialog.h index 32dd77264..0b8362843 100644 --- a/src/wx/cinema_dialog.h +++ b/src/wx/cinema_dialog.h @@ -22,10 +22,10 @@ #include "editable_list.h" #include "email_dialog.h" #include "table_dialog.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include #include @@ -37,7 +37,7 @@ public: wxWindow *, wxString, std::string name = "", - std::list emails = std::list (), + std::vector emails = std::vector(), std::string notes = "", int utc_offset_hour = 0, int utc_offset_minute = 0 @@ -45,12 +45,11 @@ public: std::string name () const; std::string notes () const; - std::list emails () const; + std::vector emails () const; int utc_offset_hour () const; int utc_offset_minute () const; private: - std::vector get_emails () const; void set_emails (std::vector); wxTextCtrl* _name;