From 74914f0da46845c0faa16117714dafbbacc6fc36 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Oct 2022 00:19:02 +0200 Subject: Cleanup: use newer syntax to make a vector. --- src/wx/markers.cc | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'src') 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> -all_markers () +all_markers() { - vector> 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>{ + { _("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 } + }; } -- cgit v1.2.3