* src/LyXRC.{cpp,h}:

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 1ece7936bb814be82ac59e88c5b1cfd1af998394..b168cd1a240c4a715a9b647952a86f4a86ccabd4 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -578,7 +578,7 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
        int const result = latex.scanLogFile(terr);
 
        if (result & LaTeX::ERRORS)
-               bufferErrors(buffer, terr, errorList);
+               buffer.bufferErrors(terr, errorList);
 
        return true;
 }
@@ -589,7 +589,7 @@ namespace {
 class ShowMessage
        : public boost::signals::trackable {
 public:
-       ShowMessage(Buffer const & b) : buffer_(b) {};
+       ShowMessage(Buffer const & b) : buffer_(b) {}
        void operator()(docstring const & msg) const { buffer_.message(msg); }
 private:
        Buffer const & buffer_;
@@ -601,7 +601,7 @@ private:
 bool Converters::runLaTeX(Buffer const & buffer, string const & command,
                          OutputParams const & runparams, ErrorList & errorList)
 {
-       buffer.busy(true);
+       buffer.setBusy(true);
        buffer.message(_("Running LaTeX..."));
 
        runparams.document_language = buffer.params().language->babel();
@@ -615,7 +615,7 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command,
        int const result = latex.run(terr);
 
        if (result & LaTeX::ERRORS)
-               bufferErrors(buffer, terr, errorList);
+               buffer.bufferErrors(terr, errorList);
 
        // check return value from latex.run().
        if ((result & LaTeX::NO_LOGFILE)) {
@@ -630,7 +630,7 @@ bool Converters::runLaTeX(Buffer const & buffer, string const & command,
        }
 
 
-       buffer.busy(false);
+       buffer.setBusy(false);
 
        int const ERROR_MASK =
                        LaTeX::NO_LOGFILE |
@@ -701,11 +701,34 @@ bool Converters::isReachable(string const & from, string const & to)
 }
 
 
-Graph::EdgePath const
-Converters::getPath(string const & from, string const & to)
+Graph::EdgePath Converters::getPath(string const & from, string const & to)
 {
        return G_.getPath(formats.getNumber(from),
                          formats.getNumber(to));
 }
 
+
+vector<Format const *> Converters::importableFormats()
+{
+       vector<string> l = loaders();
+       vector<Format const *> result = getReachableTo(l[0], true);
+       for (vector<string>::const_iterator it = l.begin() + 1;
+            it != l.end(); ++it) {
+               vector<Format const *> r = getReachableTo(*it, false);
+               result.insert(result.end(), r.begin(), r.end());
+       }
+       return result;
+}
+
+
+vector<string> Converters::loaders() const
+{
+       vector<string> v;
+       v.push_back("lyx");
+       v.push_back("text");
+       v.push_back("textparagraph");
+       return v;
+}
+
+
 } // namespace lyx