Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/xforms/FormBibitem.C b/src/frontends/xforms/FormBibitem.C
index 791687a0c33030a43ce6bbd0b0e9af1d0c8d9efb..ef32104db29e3883dfd29e75c90e712b9fe2b688 100644 (file)
--- a/src/frontends/xforms/FormBibitem.C
+++ b/src/frontends/xforms/FormBibitem.C
@@ -6,21 +6,33 @@
  * \author Angus Leeming
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
-
 #include <config.h>
-#include "xformsBC.h"
-#include "ControlBibitem.h"
+
 #include "FormBibitem.h"
-#include "Tooltips.h"
+#include "ControlCommand.h"
 #include "forms/form_bibitem.h"
-#include FORMS_H_LOCATION
-#include "gettext.h"
+
+#include "Tooltips.h"
+#include "xformsBC.h"
+
 #include "support/lstrings.h" // compare
 
-typedef FormController<ControlBibitem, FormView<FD_bibitem> > base_class;
+#include "lyx_forms.h"
+
+using std::string;
+
+
+namespace lyx {
+
+using support::compare;
+
+namespace frontend {
+
+
+typedef FormController<ControlCommand, FormView<FD_bibitem> > base_class;
 
 FormBibitem::FormBibitem(Dialog & parent)
        : base_class(parent, _("Bibliography Entry"))
@@ -38,11 +50,11 @@ void FormBibitem::build()
        setPrehandler(dialog_->input_label);
 
        // Manage the ok, apply, restore and cancel/close buttons
-       bc().setOK(dialog_->button_ok);
-       bc().setCancel(dialog_->button_close);
+       bcview().setOK(dialog_->button_ok);
+       bcview().setCancel(dialog_->button_close);
 
-       bc().addReadOnly(dialog_->input_key);
-       bc().addReadOnly(dialog_->input_label);
+       bcview().addReadOnly(dialog_->input_key);
+       bcview().addReadOnly(dialog_->input_label);
 
        // set up the tooltips
        string str = _("Key used within LyX document.");
@@ -76,3 +88,6 @@ void FormBibitem::apply()
        controller().params().setContents(fl_get_input(dialog_->input_key));
        controller().params().setOptions(fl_get_input(dialog_->input_label));
 }
+
+} // namespace frontend
+} // namespace lyx