diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-10-10 00:19:02 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-10-10 00:19:02 +0200 |
| commit | 74914f0da46845c0faa16117714dafbbacc6fc36 (patch) | |
| tree | 26f050c6be62ae7a2b5f3ae5477d75e259d5c8aa /src | |
| parent | d2471a4321499df61081944c54cea5985619ae9a (diff) | |
Cleanup: use newer syntax to make a vector.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/markers.cc | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/wx/markers.cc b/src/wx/markers.cc index 1ae5cc287..229980c08 100644 --- a/src/wx/markers.cc +++ b/src/wx/markers.cc @@ -22,25 +22,24 @@ #include "markers.h" -using std::make_pair; using std::pair; using std::vector; vector<pair<wxString, dcp::Marker>> -all_markers () +all_markers() { - vector<pair<wxString, dcp::Marker>> out; - out.push_back (make_pair(_("First frame of composition"), dcp::Marker::FFOC)); - out.push_back (make_pair(_("Last frame of composition"), dcp::Marker::LFOC)); - out.push_back (make_pair(_("First frame of title credits"), dcp::Marker::FFTC)); - out.push_back (make_pair(_("Last frame of title credits"), dcp::Marker::LFTC)); - out.push_back (make_pair(_("First frame of intermission"), dcp::Marker::FFOI)); - out.push_back (make_pair(_("Last frame of intermission"), dcp::Marker::LFOI)); - out.push_back (make_pair(_("First frame of end credits"), dcp::Marker::FFEC)); - out.push_back (make_pair(_("Last frame of end credits"), dcp::Marker::LFEC)); - out.push_back (make_pair(_("First frame of moving credits"), dcp::Marker::FFMC)); - out.push_back (make_pair(_("Last frame of moving credits"), dcp::Marker::LFMC)); - return out; + return vector<pair<wxString, dcp::Marker>>{ + { _("First frame of composition"), dcp::Marker::FFOC }, + { _("Last frame of composition"), dcp::Marker::LFOC }, + { _("First frame of title credits"), dcp::Marker::FFTC }, + { _("Last frame of title credits"), dcp::Marker::LFTC }, + { _("First frame of intermission"), dcp::Marker::FFOI }, + { _("Last frame of intermission"), dcp::Marker::LFOI }, + { _("First frame of end credits"), dcp::Marker::FFEC }, + { _("Last frame of end credits"), dcp::Marker::LFEC }, + { _("First frame of moving credits"), dcp::Marker::FFMC }, + { _("Last frame of moving credits"), dcp::Marker::LFMC } + }; } |