Cleanup: replace some list with vector.

[dcpomatic.git] / src / wx / cinema_dialog.h

diff --git a/src/wx/cinema_dialog.h b/src/wx/cinema_dialog.h
index 9cb0a65dc151509c182b50df7752078ff3bf3195..0b8362843de68f759c08a08c1b0aae8367b0d093 100644 (file)
--- a/src/wx/cinema_dialog.h
+++ b/src/wx/cinema_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,13 +18,18 @@
 
 */
 
-#include "table_dialog.h"
+
 #include "editable_list.h"
 #include "email_dialog.h"
+#include "table_dialog.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 #include <vector>
 
+
 class CinemaDialog : public wxDialog
 {
 public:
@@ -32,7 +37,7 @@ public:
                wxWindow *,
                wxString,
                std::string name = "",
-               std::list<std::string> emails = std::list<std::string> (),
+               std::vector<std::string> emails = std::vector<std::string>(),
                std::string notes = "",
                int utc_offset_hour = 0,
                int utc_offset_minute = 0
@@ -40,12 +45,11 @@ public:
 
        std::string name () const;
        std::string notes () const;
-       std::list<std::string> emails () const;
+       std::vector<std::string> emails () const;
        int utc_offset_hour () const;
        int utc_offset_minute () const;
 
 private:
-       std::vector<std::string> get_emails () const;
        void set_emails (std::vector<std::string>);
 
        wxTextCtrl* _name;
@@ -53,19 +57,5 @@ private:
        EditableList<std::string, EmailDialog>* _email_list;
        std::vector<std::string> _emails;
        wxChoice* _utc_offset;
-
-       struct Offset
-       {
-               Offset (wxString n, int h, int m)
-                       : name (n)
-                       , hour (h)
-                       , minute (m)
-               {}
-
-               wxString name;
-               int hour;
-               int minute;
-       };
-
        std::vector<Offset> _offsets;
 };