projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 e0594b5d81d059ef69bcf06b2e7c05956c1093a3..0b8362843de68f759c08a08c1b0aae8367b0d093 100644
(file)
--- a/
src/wx/cinema_dialog.h
+++ b/
src/wx/cinema_dialog.h
@@
-22,7
+22,10
@@
#include "editable_list.h"
#include "email_dialog.h"
#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>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <list>
#include <vector>
#include <list>
#include <vector>
@@
-34,7
+37,7
@@
public:
wxWindow *,
wxString,
std::string name = "",
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
std::string notes = "",
int utc_offset_hour = 0,
int utc_offset_minute = 0
@@
-42,12
+45,11
@@
public:
std::string name () const;
std::string notes () const;
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:
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;
void set_emails (std::vector<std::string>);
wxTextCtrl* _name;