X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.h;h=6775fb0f1afacc2b2449bff06d50586753ab7b37;hb=67f9c9fdae42211aa3ff8d0c6f62485bd721d8eb;hp=b247d363a34521d3db6498e7404d451168e31690;hpb=dfbd44997a2f52d0caf06d73348bc4da579ae5b3;p=lyx.git

diff --git a/src/converter.h b/src/converter.h
index b247d363a3..6775fb0f1a 100644
--- a/src/converter.h
+++ b/src/converter.h
@@ -1,8 +1,4 @@
 // -*- C++ -*-
-
-#ifndef CONVERTER_H
-#define CONVERTER_H
-
 /**
  * \file converter.h
  * This file is part of LyX, the document processor.
@@ -10,35 +6,41 @@
  *
  * \author Dekel Tsur
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
-#include "latexrunparams.h"
+#ifndef CONVERTER_H
+#define CONVERTER_H
+
 #include "graph.h"
+#include "outputparams.h"
 
 #include <vector>
+#include <string>
+
 
+class Buffer;
 class Format;
 class Formats;
+class OutputParams;
 
-class Buffer;
 
 ///
 class Converter {
 public:
 	///
-	Converter(string const & f, string const & t, string const & c,
-		  string const & l);
+	Converter(std::string const & f, std::string const & t, std::string const & c,
+		  std::string const & l);
 	///
 	void readFlags();
 	///
-	string from;
+	std::string from;
 	///
-	string to;
+	std::string to;
 	///
-	string command;
+	std::string command;
 	///
-	string flags;
+	std::string flags;
 	///
 	Format const * From;
 	///
@@ -52,12 +54,12 @@ public:
 	bool need_aux;
 	/// If the converter put the result in a directory, then result_dir
 	/// is the name of the directory
-	string result_dir;
+	std::string result_dir;
 	/// If the converter put the result in a directory, then result_file
 	/// is the name of the main file in that directory
-	string result_file;
+	std::string result_file;
 	/// Command to convert the program output to a LaTeX log file format
-	string parselog;
+	std::string parselog;
 };
 
 
@@ -75,44 +77,45 @@ public:
 		return converterlist_[i];
 	}
 	///
-	Converter const * getConverter(string const & from, string const & to);
+	Converter const * getConverter(std::string const & from,
+				       std::string const & to) const;
 	///
-	int getNumber(string const & from, string const & to);
+	int getNumber(std::string const & from, std::string const & to) const;
 	///
-	void add(string const & from, string const & to,
-		 string const & command, string const & flags);
+	void add(std::string const & from, std::string const & to,
+		 std::string const & command, std::string const & flags);
 	//
-	void erase(string const & from, string const & to);
+	void erase(std::string const & from, std::string const & to);
 	///
 	void sort();
 	///
 	std::vector<Format const *> const
-	getReachableTo(string const & target, bool clear_visited);
+	getReachableTo(std::string const & target, bool clear_visited);
 	///
 	std::vector<Format const *> const
-	getReachable(string const & from, bool only_viewable,
+	getReachable(std::string const & from, bool only_viewable,
 		     bool clear_visited);
 	///
-	bool isReachable(string const & from, string const & to);
+	bool isReachable(std::string const & from, std::string const & to);
 	///
-	Graph::EdgePath const getPath(string const & from, string const & to);
+	Graph::EdgePath const getPath(std::string const & from, std::string const & to);
 	///
-	bool usePdflatex(Graph::EdgePath const & path);
+	OutputParams::FLAVOR getFlavor(Graph::EdgePath const & path);
 	///
 	bool convert(Buffer const * buffer,
-		     string const & from_file, string const & to_file_base,
-		     string const & from_format, string const & to_format,
-		     string & to_file);
+		     std::string const & from_file, std::string const & to_file_base,
+		     std::string const & from_format, std::string const & to_format,
+		     std::string & to_file);
 	///
 	bool convert(Buffer const * buffer,
-		     string const & from_file, string const & to_file_base,
-		     string const & from_format, string const & to_format);
+		     std::string const & from_file, std::string const & to_file_base,
+		     std::string const & from_format, std::string const & to_format);
 	///
 	void update(Formats const & formats);
 	///
 	void updateLast(Formats const & formats);
 	///
-	bool formatIsUsed(string const & format);
+	bool formatIsUsed(std::string const & format);
 	///
 	const_iterator begin() const {
 		return converterlist_.begin();
@@ -125,19 +128,19 @@ public:
 private:
 	///
 	std::vector<Format const *> const
-	Converters::intToFormat(std::vector<int> const & input);
+	intToFormat(std::vector<int> const & input);
 	///
-	bool scanLog(Buffer const * buffer, string const & command,
-		     string const & filename);
+	bool scanLog(Buffer const & buffer, std::string const & command,
+		     std::string const & filename);
 	///
-	bool runLaTeX(Buffer const * buffer, string const & command,
-		      LatexRunParams const &);
+	bool runLaTeX(Buffer const & buffer, std::string const & command,
+		      OutputParams const &);
 	///
 	ConverterList converterlist_;
 	///
-	string latex_command_;
+	std::string latex_command_;
 	///
-	bool move(string const & from, string const & to, bool copy);
+	bool move(std::string const & from, std::string const & to, bool copy);
 	///
 	Graph G_;
 };