X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormSendto.C;h=6841c28664e487dd808bdc5bc4f5a32f811cd18e;hb=1e3d2fce7fdf59ffebedee91ce50d02307ce2083;hp=78101b2852176083b7f097b9f79f2d607a2faab2;hpb=30180184cdf0ad89dff4efe1e8afed6df1dc725d;p=lyx.git

diff --git a/src/frontends/xforms/FormSendto.C b/src/frontends/xforms/FormSendto.C
index 78101b2852..6841c28664 100644
--- a/src/frontends/xforms/FormSendto.C
+++ b/src/frontends/xforms/FormSendto.C
@@ -13,26 +13,27 @@
 #endif
 
 #include "FormSendto.h"
-#include "form_sendto.h"
+#include "forms/form_sendto.h"
 #include "ControlSendto.h"
 #include "xformsBC.h"
 #include "Tooltips.h"
 #include "xforms_helpers.h"
 #include "converter.h"
 #include "gettext.h"
+#include FORMS_H_LOCATION
 
 using std::vector;
 
-typedef FormCB<ControlSendto, FormDB<FD_form_sendto> > base_class;
+typedef FormCB<ControlSendto, FormDB<FD_sendto> > base_class;
 
-FormSendto::FormSendto(ControlSendto & c)
-	: base_class(c, _("Send document to command"))
+FormSendto::FormSendto()
+	: base_class(_("Send document to command"))
 {}
 
 
 void FormSendto::build()
 {
-	dialog_.reset(build_sendto());
+	dialog_.reset(build_sendto(this));
 
 	fl_set_input_return(dialog_->input_command, FL_RETURN_CHANGED);
 	setPrehandler(dialog_->input_command);
@@ -68,7 +69,7 @@ void FormSendto::update()
 	}
 
 	vector<string> const browser_keys =
-		getVectorFromBrowser(dialog_->browser_formats);
+		getVector(dialog_->browser_formats);
 
 	if (browser_keys == keys)
 		return;
@@ -91,8 +92,8 @@ ButtonPolicy::SMInput FormSendto::input(FL_OBJECT *, long)
 	if (line < 1 || line > fl_get_browser_maxline(dialog_->browser_formats))
 		return ButtonPolicy::SMI_INVALID;
 
-	string cmd = getStringFromInput(dialog_->input_command);
-	cmd = strip(frontStrip(cmd));
+	string cmd = getString(dialog_->input_command);
+	cmd = trim(cmd);
 	if (cmd.empty())
 		return ButtonPolicy::SMI_INVALID;
 
@@ -106,7 +107,7 @@ void FormSendto::apply()
 	if (line < 1 || line > fl_get_browser_maxline(dialog_->browser_formats))
 		return;
 
-	string const cmd = getStringFromInput(dialog_->input_command);
+	string const cmd = getString(dialog_->input_command);
 
 	controller().setFormat(all_formats_[line-1]);
 	controller().setCommand(cmd);