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
/
lib
/
dkdm_recipient.h
diff --git
a/src/lib/dkdm_recipient.h
b/src/lib/dkdm_recipient.h
index ecaccd0a0200ab2511ab82c0898d96d3873de7e2..7a0fa01854c271347fbc96f151367e8b453cb21b 100644
(file)
--- a/
src/lib/dkdm_recipient.h
+++ b/
src/lib/dkdm_recipient.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2020
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,11
+18,14
@@
*/
*/
+
#include "kdm_recipient.h"
#include "kdm_with_metadata.h"
#include "kdm_recipient.h"
#include "kdm_with_metadata.h"
+
class Film;
class Film;
+
class DKDMRecipient : public KDMRecipient
{
public:
class DKDMRecipient : public KDMRecipient
{
public:
@@
-30,11
+33,11
@@
public:
std::string const& name_,
std::string const& notes_,
boost::optional<dcp::Certificate> recipient_,
std::string const& name_,
std::string const& notes_,
boost::optional<dcp::Certificate> recipient_,
- std::
list
<std::string> emails_,
+ std::
vector
<std::string> emails_,
int utc_offset_hour_,
int utc_offset_minute_
)
int utc_offset_hour_,
int utc_offset_minute_
)
- : KDMRecipient (name_, notes_, recipient_)
+ : KDMRecipient (name_, notes_, recipient_
, boost::none
)
, emails (emails_)
, utc_offset_hour (utc_offset_hour_)
, utc_offset_minute (utc_offset_minute_)
, emails (emails_)
, utc_offset_hour (utc_offset_hour_)
, utc_offset_minute (utc_offset_minute_)
@@
-44,9
+47,9
@@
public:
explicit DKDMRecipient (cxml::ConstNodePtr);
explicit DKDMRecipient (cxml::ConstNodePtr);
- void as_xml (xmlpp::Element *) const;
+ void as_xml (xmlpp::Element *) const
override
;
- std::
list
<std::string> emails;
+ std::
vector
<std::string> emails;
int utc_offset_hour;
int utc_offset_minute;
};
int utc_offset_hour;
int utc_offset_minute;
};
@@
-54,9
+57,9
@@
public:
KDMWithMetadataPtr
kdm_for_dkdm_recipient (
KDMWithMetadataPtr
kdm_for_dkdm_recipient (
-
boost
::shared_ptr<const Film> film,
+
std
::shared_ptr<const Film> film,
boost::filesystem::path cpl,
boost::filesystem::path cpl,
-
boost
::shared_ptr<DKDMRecipient> recipient,
+
std
::shared_ptr<DKDMRecipient> recipient,
boost::posix_time::ptime valid_from,
boost::posix_time::ptime valid_to
);
boost::posix_time::ptime valid_from,
boost::posix_time::ptime valid_to
);