From: Carl Hetherington Date: Sun, 23 Jan 2022 00:01:55 +0000 (+0100) Subject: Switch a list for vector. X-Git-Tag: checked-for-v2.16.x~39 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=944b42e915af4f89fb40bb5cf948277d5e0a1f59;p=dcpomatic.git Switch a list for vector. --- diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index 534b40604..65625e0df 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2021 Carl Hetherington + Copyright (C) 2015-2022 Carl Hetherington This file is part of DCP-o-matic. @@ -19,24 +19,24 @@ */ -#include "screens_panel.h" -#include "wx_util.h" #include "cinema_dialog.h" -#include "screen_dialog.h" #include "dcpomatic_button.h" -#include "lib/config.h" +#include "screen_dialog.h" +#include "screens_panel.h" +#include "wx_util.h" #include "lib/cinema.h" +#include "lib/config.h" #include "lib/screen.h" -using std::list; -using std::pair; using std::cout; -using std::map; -using std::string; using std::make_pair; using std::make_shared; +using std::map; +using std::pair; using std::shared_ptr; +using std::string; +using std::vector; using boost::optional; using namespace dcpomatic; @@ -354,10 +354,10 @@ ScreensPanel::remove_screen_clicked () } -list> +vector> ScreensPanel::screens () const { - list> output; + vector> output; for (auto item = _targets->GetFirstItem(); item.IsOk(); item = _targets->GetNextItem(item)) { if (_targets->GetCheckedState(item) == wxCHK_CHECKED) { diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h index d5c5144bd..bea9c2995 100644 --- a/src/wx/screens_panel.h +++ b/src/wx/screens_panel.h @@ -61,7 +61,7 @@ public: explicit ScreensPanel (wxWindow* parent); ~ScreensPanel (); - std::list> screens () const; + std::vector> screens () const; void setup_sensitivity (); boost::signals2::signal ScreensChanged;