X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.h;h=6350fd5fdc98a623bb10e4af730386053bb309d4;hb=c727c6db7f2dd7f6a727462f5d11964888d0e76e;hp=9cec2c122b132ddf1734532f4267eea9952ed688;hpb=5ed606f9c5ae2ee31cd665e7d4408f858b6ef9f2;p=lyx.git

diff --git a/src/converter.h b/src/converter.h
index 9cec2c122b..6350fd5fdc 100644
--- a/src/converter.h
+++ b/src/converter.h
@@ -21,6 +21,7 @@
 
 namespace lyx {
 
+namespace support { class FileName; }
 
 class Buffer;
 class ErrorList;
@@ -118,8 +119,8 @@ public:
 	};
 	///
 	bool convert(Buffer const * buffer,
-	             std::string const & from_file, std::string const & to_file,
-	             std::string const & orig_from,
+	             support::FileName const & from_file, support::FileName const & to_file,
+	             support::FileName const & orig_from,
 	             std::string const & from_format, std::string const & to_format,
 	             ErrorList & errorList, int conversionflags = none);
 	///
@@ -143,7 +144,7 @@ private:
 	intToFormat(std::vector<int> const & input);
 	///
 	bool scanLog(Buffer const & buffer, std::string const & command,
-		     std::string const & filename, ErrorList & errorList);
+		     support::FileName const & filename, ErrorList & errorList);
 	///
 	bool runLaTeX(Buffer const & buffer, std::string const & command,
 		      OutputParams const &, ErrorList & errorList);
@@ -154,16 +155,19 @@ private:
 	/// If \p from = /path/file.ext and \p to = /path2/file2.ext2 then
 	/// this method moves each /path/file*.ext file to /path2/file2*.ext2
 	bool move(std::string const & fmt,
-		  std::string const & from, std::string const & to,
+		  support::FileName const & from, support::FileName const & to,
 		  bool copy);
 	///
 	Graph G_;
 };
 
-extern Converters converters;
-
-extern Converters system_converters;
+/// The global instance.
+/// Implementation is in lyx_main.C.
+extern Converters & theConverters();
 
+/// The global copy after reading lyxrc.defaults.
+/// Implementation is in lyx_main.C.
+extern Converters & theSystemConverters();
 
 } // namespace lyx