Add a Buffer::fully_loaded member function, returning true only when

[lyx.git] / src / converter.C

diff --git a/src/converter.C b/src/converter.C
index f5a6c8ffdecd65ee22df7efa8ec0ef21b97a7979..370843056bf2a18ce44abe252813bc62dd0746c0 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -11,41 +11,46 @@
 #include <config.h>
 
 #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 <boost/signals/signal1.hpp>
-#include <boost/signals/trackable.hpp>
-
-#include <cctype>
-
-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 {
 
@@ -310,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) {
@@ -344,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);