* Paragraph: erase unused some method and move some members to Paragraph::Private.

[lyx.git] / src / Converter.cpp

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 3108d6d286d057bf5ad79f7c3c0f3dfbf190ce00..481d706ed1fd8dae24d8b28e07e79369f3c52e72 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -50,7 +50,6 @@ using support::contains;
 using support::dirList;
 using support::FileName;
 using support::getExtension;
-using support::isFileReadable;
 using support::libFileSearch;
 using support::libScriptSearch;
 using support::makeAbsPath;
@@ -323,7 +322,7 @@ bool Converters::convert(Buffer const * buffer,
                                << command << endl;
                        Systemcall one;
                        one.startscript(Systemcall::Wait, command);
-                       if (isFileReadable(to_file)) {
+                       if (to_file.isFileReadable()) {
                                if (conversionflags & try_cache)
                                        ConverterCache::get().add(orig_from,
                                                        to_format, to_file);
@@ -579,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;
 }
@@ -587,13 +586,11 @@ bool Converters::scanLog(Buffer const & buffer, string const & /*command*/,
 
 namespace {
 
-class showMessage : public std::unary_function<docstring, void>, public boost::signals::trackable {
+class ShowMessage
+       : public boost::signals::trackable {
 public:
-       showMessage(Buffer const & b) : buffer_(b) {};
-       void operator()(docstring const & m) const
-       {
-               buffer_.message(m);
-       }
+       ShowMessage(Buffer const & b) : buffer_(b) {}
+       void operator()(docstring const & msg) const { buffer_.message(msg); }
 private:
        Buffer const & buffer_;
 };
@@ -604,21 +601,21 @@ 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();
 
        // do the LaTeX run(s)
-       string const name = buffer.getLatexName();
+       string const name = buffer.latexName();
        LaTeX latex(command, runparams, FileName(makeAbsPath(name)));
        TeXErrors terr;
-       showMessage show(buffer);
+       ShowMessage show(buffer);
        latex.message.connect(show);
        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)) {
@@ -633,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 |