summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-01-23 01:01:55 +0100
committerCarl Hetherington <cth@carlh.net>2022-03-09 17:04:02 +0100
commit943047c84a0cdc7fbcec392f512157d637b8ec71 (patch)
treea1e13f20bdb623ee01a7140942696a15b2efdfa3 /src
parentf3bc2bad4657d660a07f9578b2cb1897b4e9d8c2 (diff)
Switch a list for vector.
Diffstat (limited to 'src')
-rw-r--r--src/wx/screens_panel.cc22
-rw-r--r--src/wx/screens_panel.h2
2 files changed, 12 insertions, 12 deletions
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 <cth@carlh.net>
+ Copyright (C) 2015-2022 Carl Hetherington <cth@carlh.net>
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<shared_ptr<Screen>>
+vector<shared_ptr<Screen>>
ScreensPanel::screens () const
{
- list<shared_ptr<Screen>> output;
+ vector<shared_ptr<Screen>> 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<std::shared_ptr<dcpomatic::Screen>> screens () const;
+ std::vector<std::shared_ptr<dcpomatic::Screen>> screens () const;
void setup_sensitivity ();
boost::signals2::signal<void ()> ScreensChanged;