Tiny clean-ups.

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

diff --git a/src/frontends/xforms/FormBibtex.C b/src/frontends/xforms/FormBibtex.C
index b2c118cfc65a9d484f9c65dd2ff6ff10e7cfae7d..0680b60d19771f05eb9234f63144963e4932902c 100644 (file)
--- a/src/frontends/xforms/FormBibtex.C
+++ b/src/frontends/xforms/FormBibtex.C
@@ -5,31 +5,39 @@
  *
  * \author Angus Leeming
  * \author John Levon
- * \author Herbert Voss
+ * \author Herbert Voß
  * \author Rob Lahaye
  *
- * 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 "ControlBibtex.h"
+
 #include "FormBibtex.h"
+#include "ControlBibtex.h"
 #include "forms/form_bibtex.h"
+
 #include "Tooltips.h"
 #include "xforms_helpers.h"
-#include "lyx_forms.h"
+#include "xformsBC.h"
 
-#include "helper_funcs.h"
-#include "gettext.h"
-#include "support/lstrings.h"
 #include "support/filetools.h"
+#include "support/lstrings.h"
 #include "support/lyxalgo.h"
 
+#include "lyx_forms.h"
+
+using lyx::support::ChangeExtension;
+using lyx::support::compare;
+using lyx::support::contains;
+using lyx::support::getStringFromVector;
+using lyx::support::getVectorFromString;
+using lyx::support::OnlyFilename;
+using lyx::support::prefixIs;
+using lyx::support::split;
 
 using std::vector;
-using std::sort;
+using std::string;
 
 
 typedef FormController<ControlBibtex, FormView<FD_bibtex> > base_class;
@@ -142,9 +150,10 @@ ButtonPolicy::SMInput FormBibtex::input(FL_OBJECT * ob, long ob_value)
        } else if (ob == dialog_->button_rescan) {
                fl_clear_browser(dialog_->browser_styles);
                controller().rescanBibStyles();
-               string const str =
-                       controller().getBibStyles();
-               fl_add_browser_line(dialog_->browser_styles, str.c_str());
+               vector<string> styles;
+               controller().getBibStyles(styles);
+               fl_add_browser_line(dialog_->browser_styles,
+                                   getStringFromVector(styles, "\n").c_str());
        }
 
        // with an empty database nothing makes sense ...
@@ -175,9 +184,12 @@ void FormBibtex::update()
        }
        fl_set_input(dialog_->input_style, bibstyle.c_str());
 
+       vector<string> styles;
+       controller().getBibStyles(styles);
+
        fl_clear_browser(dialog_->browser_styles);
-       string const str = controller().getBibStyles();
-       fl_add_browser_line(dialog_->browser_styles, str.c_str());
+       fl_add_browser_line(dialog_->browser_styles,
+                           getStringFromVector(styles, "\n").c_str());
 }
 
 namespace {