merge booktabs branch

[lyx.git] / src / frontends / xforms / FormSendto.C

diff --git a/src/frontends/xforms/FormSendto.C b/src/frontends/xforms/FormSendto.C
index 5316c9bcb786788b7d320808df532a3a31197e52..3784475a887adca11785eabd859ee6d60feb60b6 100644 (file)
--- a/src/frontends/xforms/FormSendto.C
+++ b/src/frontends/xforms/FormSendto.C
@@ -5,28 +5,38 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-
 #include "FormSendto.h"
-#include "forms/form_sendto.h"
 #include "ControlSendto.h"
-#include "xformsBC.h"
+#include "forms/form_sendto.h"
+
 #include "Tooltips.h"
 #include "xforms_helpers.h"
+#include "xformsBC.h"
+
 #include "format.h"
-#include "gettext.h"
-#include FORMS_H_LOCATION
+
+#include "support/lstrings.h"
+
+#include "lyx_forms.h"
 
 using std::vector;
+using std::string;
+
+namespace lyx {
 
-typedef FormCB<ControlSendto, FormDB<FD_sendto> > base_class;
+using support::trim;
 
-FormSendto::FormSendto()
-       : base_class(_("Send document to command"))
+namespace frontend {
+
+typedef FormController<ControlSendto, FormView<FD_sendto> > base_class;
+
+FormSendto::FormSendto(Dialog & parent)
+       : base_class(parent, _("Send Document to Command"))
 {}
 
 
@@ -38,9 +48,9 @@ void FormSendto::build()
        setPrehandler(dialog_->input_command);
 
        // Manage the ok, apply, restore and cancel/close buttons
-       bc().setOK(dialog_->button_ok);
-       bc().setApply(dialog_->button_apply);
-       bc().setCancel(dialog_->button_close);
+       bcview().setOK(dialog_->button_ok);
+       bcview().setApply(dialog_->button_apply);
+       bcview().setCancel(dialog_->button_close);
 
        // Set up the tooltip mechanism
        string str = _("Export the buffer to this format before running the command below on it.");
@@ -111,3 +121,6 @@ void FormSendto::apply()
        controller().setFormat(all_formats_[line-1]);
        controller().setCommand(cmd);
 }
+
+} // namespace frontend
+} // namespace lyx