introduce namespace lyx::support

[lyx.git] / src / frontends / controllers / ControlBibtex.C

diff --git a/src/frontends/controllers/ControlBibtex.C b/src/frontends/controllers/ControlBibtex.C
index 7747a78ce6f80dfdf3001dd1e07db53639cd7134..36d67785723bf00c04247f162e05a45d53761df6 100644 (file)
--- a/src/frontends/controllers/ControlBibtex.C
+++ b/src/frontends/controllers/ControlBibtex.C
@@ -21,11 +21,16 @@
 #include "tex_helpers.h"
 #include "gettext.h"
 
+#include "support/filetools.h"
+
+using namespace lyx::support;
+
 using std::pair;
+using std::vector;
 
 
 ControlBibtex::ControlBibtex(Dialog & d)
-       : ControlCommand(d, LFUN_BIBTEX_APPLY)
+       : ControlCommand(d, "bibtex")
 {}
 
 
@@ -40,27 +45,39 @@ string const ControlBibtex::Browse(string const & in_name,
 }
 
 
-string const ControlBibtex::getBibStyles() const
+void ControlBibtex::getBibStyles(vector<string> & data) const
 {
-       string list = getTexFileList("bstFiles.lst", false);
+       data.clear();
+
+       getTexFileList("bstFiles.lst", data);
        // test, if we have a valid list, otherwise run rescan
-       if (list.empty()) {
+       if (data.empty()) {
                rescanBibStyles();
-               list = getTexFileList("bstFiles.lst", false);
+               getTexFileList("bstFiles.lst", data);
+       }
+       vector<string>::iterator it  = data.begin();
+       vector<string>::iterator end = data.end();
+       for (; it != end; ++it) {
+               *it = OnlyFilename(*it);
        }
-       return list;
 }
 
 
-string const ControlBibtex::getBibFiles() const
+void ControlBibtex::getBibFiles(vector<string> & data) const
 {
-       string list = getTexFileList("bibFiles.lst", false);
+       data.clear();
+
+       getTexFileList("bibFiles.lst", data);
        // test, if we have a valid list, otherwise run rescan
-       if (list.empty()) {
+       if (data.empty()) {
                rescanBibStyles();
-               list = getTexFileList("bibFiles.lst", false);
+               getTexFileList("bibFiles.lst", data);
+       }
+       vector<string>::iterator it  = data.begin();
+       vector<string>::iterator end = data.end();
+       for (; it != end; ++it) {
+               *it = OnlyFilename(*it);
        }
-       return list;
 }