X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fwx%2Frecipient_dialog.h;h=a46e67af5b907ebdfe3fa2b2fa441f091cff1355;hb=4e2e10d256f8a1c107db9ce33042a2ed28fdc0bd;hp=a3de94d56da0778a8f43aa736f6597c6f20139b0;hpb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;p=dcpomatic.git diff --git a/src/wx/recipient_dialog.h b/src/wx/recipient_dialog.h index a3de94d56..a46e67af5 100644 --- a/src/wx/recipient_dialog.h +++ b/src/wx/recipient_dialog.h @@ -23,11 +23,11 @@ #include "email_dialog.h" #include "wx_util.h" #include "lib/screen.h" -#include "lib/warnings.h" #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include @@ -43,7 +43,7 @@ public: wxString, std::string name = "", std::string notes = "", - std::list emails = std::list(), + std::vector emails = std::vector(), int utc_offset_hour = 0, int utc_offset_minute = 0, boost::optional c = boost::optional() @@ -52,7 +52,7 @@ public: std::string name () const; std::string notes () const; boost::optional recipient () const; - std::list emails () const; + std::vector emails () const; int utc_offset_hour () const; int utc_offset_minute () const;