Switch a list for vector.
authorCarl Hetherington <cth@carlh.net>
Sun, 23 Jan 2022 00:01:55 +0000 (01:01 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 23 Jan 2022 00:10:46 +0000 (01:10 +0100)
src/wx/screens_panel.cc
src/wx/screens_panel.h

index 534b40604213e9fb4fb6e47a63a89bf773331b7a..65625e0df534ad414fdf61d584869369b3d1c99c 100644 (file)
@@ -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.
 
 */
 
 
-#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) {
index d5c5144bdff5c724024288eaf3a9bad9419fe182..bea9c2995672526ec59a2ca0edc17cea4a404b3a 100644 (file)
@@ -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;