diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-02-20 23:06:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-02-22 23:05:14 +0100 |
| commit | b29a0f4bc67f6f8cc84c3d88cdbb9582e35d3fed (patch) | |
| tree | 8e518d1300e96ea7385c84a490015bf54ad998d6 /src/tools | |
| parent | 674b74173d2d0ec8e178fa0938a4c48c2863c38b (diff) | |
Return std::vector instead of boost::optional from the EditableList dialog.
It's a bit clumsy, as returning more than one thing only makes sense
when adding (not when editing), but allowing both optional and vector
with template voodoo seems awkward (at least with C++11).
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_combiner.cc | 4 | ||||
| -rw-r--r-- | src/tools/dcpomatic_disk.cc | 4 | ||||
| -rw-r--r-- | src/tools/dcpomatic_editor.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc index 890f01ad0..78edc0795 100644 --- a/src/tools/dcpomatic_combiner.cc +++ b/src/tools/dcpomatic_combiner.cc @@ -74,9 +74,9 @@ public: return DirDialog::show() ? wxID_OK : wxID_CANCEL; } - optional<boost::filesystem::path> get () const + vector<boost::filesystem::path> get() const { - return path(); + return { path() }; } void set (boost::filesystem::path) diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc index ab603ccad..b9645a7ca 100644 --- a/src/tools/dcpomatic_disk.cc +++ b/src/tools/dcpomatic_disk.cc @@ -85,7 +85,7 @@ public: } - boost::optional<boost::filesystem::path> get () const + vector<boost::filesystem::path> get() const { auto const dcp = boost::filesystem::path(wx_to_std(GetPath())); if (!dcp::filesystem::exists(dcp / "ASSETMAP") && !dcp::filesystem::exists(dcp / "ASSETMAP.xml")) { @@ -93,7 +93,7 @@ public: return {}; } - return dcp; + return { dcp }; } void set (boost::filesystem::path) diff --git a/src/tools/dcpomatic_editor.cc b/src/tools/dcpomatic_editor.cc index 2f86851c8..1e0d5672d 100644 --- a/src/tools/dcpomatic_editor.cc +++ b/src/tools/dcpomatic_editor.cc @@ -158,8 +158,8 @@ public: SetSizerAndFit(_sizer); } - optional<shared_ptr<dcp::Reel>> get() { - return _reel; + vector<shared_ptr<dcp::Reel>> get() { + return { _reel }; } void set(shared_ptr<dcp::Reel> reel) |