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/wx/screen_dialog.cc | |
| 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/wx/screen_dialog.cc')
| -rw-r--r-- | src/wx/screen_dialog.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index d0cf499e9..21786b8a2 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -86,13 +86,13 @@ public: setup_sensitivity(); } - optional<TrustedDevice> get () + vector<TrustedDevice> get() { auto const t = wx_to_std (_thumbprint->GetValue()); if (_certificate && _certificate->thumbprint() == t) { - return TrustedDevice (*_certificate); + return { TrustedDevice(*_certificate) }; } else if (t.length() == 28) { - return TrustedDevice (t); + return { TrustedDevice(t) }; } return {}; |
