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).

1 files changed, 8 insertions, 4 deletions

diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index ef03609ba..ffc757faa 100644
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -18,14 +18,18 @@
 
 */
 
-#include "lib/encode_server.h"
+
 #include "server_dialog.h"
 #include "wx_util.h"
+#include "lib/encode_server.h"
+
 
-using std::string;
 using std::shared_ptr;
+using std::string;
+using std::vector;
 using boost::optional;
 
+
 ServerDialog::ServerDialog (wxWindow* parent)
 	: TableDialog (parent, _("Server"), 2, 1, true)
 {
@@ -51,8 +55,8 @@ ServerDialog::set (string server)
 	_host->SetValue (std_to_wx (server));
 }
 
-optional<string>
+vector<string>
 ServerDialog::get () const
 {
-	return wx_to_std (_host->GetValue ());
+	return { wx_to_std(_host->GetValue()) };
 }