X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_properties_dialog.cc;h=bc835edafc305358d15d3eda63e9cb4c23e4115b;hb=a1d11f2e9cc3678bd68b95c0e444c8245ef776b5;hp=7dcc6f8f1060ce4c5636bf7195facb0f2d6db903;hpb=3c414bf90d4cfcfe342c0b057b5134f72485fe32;p=dcpomatic.git diff --git a/src/wx/content_properties_dialog.cc b/src/wx/content_properties_dialog.cc index 7dcc6f8f1..bc835edaf 100644 --- a/src/wx/content_properties_dialog.cc +++ b/src/wx/content_properties_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2018 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "content_properties_dialog.h" #include "wx_util.h" #include "static_text.h" @@ -25,20 +26,21 @@ #include "lib/video_content.h" #include "lib/audio_content.h" #include -#include + using std::string; using std::list; using std::pair; using std::map; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; + ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr film, shared_ptr content) : TableDialog (parent, _("Content Properties"), 2, 1, false) { - map > grouped; - BOOST_FOREACH (UserProperty i, content->user_properties(film)) { + map> grouped; + for (auto i: content->user_properties(film)) { if (grouped.find(i.category) == grouped.end()) { grouped[i.category] = list (); } @@ -51,16 +53,17 @@ ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr > const & groups, UserProperty::Category category) +ContentPropertiesDialog::maybe_add_group (map> const & groups, UserProperty::Category category) { - map >::const_iterator i = groups.find (category); + auto i = groups.find (category); if (i == groups.end()) { return; } @@ -81,7 +84,7 @@ ContentPropertiesDialog::maybe_add_group (mapSetFont (font); @@ -91,7 +94,7 @@ ContentPropertiesDialog::maybe_add_group (mapsecond) { + for (auto j: i->second) { add (std_to_wx (j.key), true); add (new StaticText (this, std_to_wx (j.value + " " + j.unit))); }