X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.C;h=370843056bf2a18ce44abe252813bc62dd0746c0;hb=78046794ccfce3a20751e00b35295c290853afd6;hp=a3e5c6518effe4895c2bddd127b47d15d5135d34;hpb=f228e412032ef6e82121168863f4313fc82e440d;p=lyx.git diff --git a/src/converter.C b/src/converter.C index a3e5c6518e..370843056b 100644 --- a/src/converter.C +++ b/src/converter.C @@ -11,42 +11,46 @@ #include #include "converter.h" -#include "graph.h" -#include "format.h" -#include "lyxrc.h" + #include "buffer.h" -#include "bufferparams.h" #include "buffer_funcs.h" -#include "bufferview_funcs.h" -#include "errorlist.h" -#include "LaTeX.h" -#include "gettext.h" +#include "bufferparams.h" #include "debug.h" +#include "format.h" +#include "gettext.h" +#include "LaTeX.h" #include "frontends/Alert.h" -#include "frontends/LyXView.h" #include "support/filetools.h" -#include "support/lyxfunctional.h" #include "support/lyxlib.h" #include "support/path.h" -#include "support/tostr.h" #include "support/systemcall.h" -#include -#include - -#include - -using namespace lyx::support; - -#ifndef CXX_GLOBAL_CSTD -using std::isdigit; -#endif +using lyx::support::AddName; +using lyx::support::bformat; +using lyx::support::ChangeExtension; +using lyx::support::compare_ascii_no_case; +using lyx::support::contains; +using lyx::support::DirList; +using lyx::support::GetExtension; +using lyx::support::LibScriptSearch; +using lyx::support::MakeRelPath; +using lyx::support::OnlyFilename; +using lyx::support::OnlyPath; +using lyx::support::Path; +using lyx::support::prefixIs; +using lyx::support::QuoteName; +using lyx::support::rename; +using lyx::support::split; +using lyx::support::subst; +using lyx::support::Systemcall; -using std::vector; using std::endl; using std::find_if; +using std::string; +using std::vector; + namespace { @@ -311,7 +315,7 @@ bool Converters::convert(Buffer const * buffer, string real_outfile; if (outfile == infile) { real_outfile = infile; - outfile = AddName(buffer->tmppath, "tmpfile.out"); + outfile = AddName(buffer->temppath(), "tmpfile.out"); } if (conv.latex) { @@ -345,10 +349,10 @@ bool Converters::convert(Buffer const * buffer, if (conv.from == "dvi" && conv.to == "ps") command = add_options(command, - buffer->params.dvips_options()); + buffer->params().dvips_options()); else if (conv.from == "dvi" && prefixIs(conv.to, "pdf")) command = add_options(command, - dvipdfm_options(buffer->params)); + dvipdfm_options(buffer->params())); lyxerr[Debug::FILES] << "Calling " << command << endl; buffer->message(_("Executing command: ") + command);