X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fwx%2Frecipients_panel.h;h=aacfccd9a90b96cc2695f3326b85c8a0390f8935;hb=ef75460b74fd0e8ce4f69a08cf658ad5e3705aae;hp=15c043f1aa693f6d5167ac2332dbbf6c362c83e7;hpb=3e96f929fdf740f414b114c5d9765e22fcc46de6;p=dcpomatic.git diff --git a/src/wx/recipients_panel.h b/src/wx/recipients_panel.h index 15c043f1a..aacfccd9a 100644 --- a/src/wx/recipients_panel.h +++ b/src/wx/recipients_panel.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2020 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,17 +18,22 @@ */ + #include "lib/dkdm_recipient.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include #include #include -#include +DCPOMATIC_ENABLE_WARNINGS #include #include #include + class DKDMRecipient; + class RecipientsPanel : public wxPanel { public: @@ -37,12 +42,12 @@ public: void setup_sensitivity (); - std::list > recipients () const; + std::list> recipients () const; boost::signals2::signal RecipientsChanged; private: void add_recipients (); - void add_recipient (boost::shared_ptr); + void add_recipient (std::shared_ptr); void add_recipient_clicked (); void edit_recipient_clicked (); void remove_recipient_clicked (); @@ -57,7 +62,7 @@ private: wxButton* _remove_recipient; wxTreeItemId _root; - typedef std::map > RecipientMap; + typedef std::map> RecipientMap; RecipientMap _recipients; RecipientMap _selected;