X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.h;h=018ee81457dc354ad7b4894870abd2c4f962c21a;hb=29b6f5cad958e3298fc76d8ca6af6b721fa038cb;hp=c7e34a530e242b7703019a612f92eb4c3301b9d0;hpb=875a88023be82ab340f48d451f23beaf89211522;p=lyx.git

diff --git a/src/buffer.h b/src/buffer.h
index c7e34a530e..018ee81457 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -18,6 +18,7 @@
 #include "dociterator.h"
 #include "ParagraphList_fwd.h"
 
+#include "support/filename.h"
 #include "support/limited_stack.h"
 #include "support/types.h"
 #include "support/docstring.h"
@@ -35,8 +36,6 @@
 
 namespace lyx {
 
-namespace support { class FileName; }
-
 class BufferParams;
 class ErrorItem;
 class FuncRequest;
@@ -100,7 +99,7 @@ public:
 	void loadAutoSaveFile();
 
 	/// load a new file
-	bool readFile(std::string const & filename);
+	bool readFile(support::FileName const & filename);
 
 	/// read the header, returns number of unknown tokens
 	int readHeader(LyXLex & lex);
@@ -148,7 +147,7 @@ public:
 	bool writeFile(support::FileName const &) const;
 
 	/// Just a wrapper for the method below, first creating the ofstream.
-	bool makeLaTeXFile(std::string const & filename,
+	bool makeLaTeXFile(support::FileName const & filename,
 			   std::string const & original_path,
 			   OutputParams const &,
 			   bool output_preamble = true,
@@ -160,7 +159,7 @@ public:
 			   bool output_preamble = true,
 			   bool output_body = true);
 	///
-	void makeDocBookFile(std::string const & filename,
+	void makeDocBookFile(support::FileName const & filename,
 			     OutputParams const & runparams_in,
 			     bool only_body = false);
 	///
@@ -256,13 +255,13 @@ public:
 	void validate(LaTeXFeatures &) const;
 
 	/// return all bibkeys from buffer and its childs
-	void fillWithBibKeys(std::vector<std::pair<std::string, std::string> > & keys) const;
+	void fillWithBibKeys(std::vector<std::pair<std::string, docstring> > & keys) const;
 	/// Update the cache with all bibfiles in use (including bibfiles
 	/// of loaded child documents).
 	void updateBibfilesCache();
 	/// Return the cache with all bibfiles in use (including bibfiles
 	/// of loaded child documents).
-	std::vector<std::string> const & getBibfilesCache() const;
+	std::vector<support::FileName> const & getBibfilesCache() const;
 	///
 	void getLabelList(std::vector<docstring> &) const;
 
@@ -368,7 +367,7 @@ private:
 	/** Inserts a file into a document
 	    \return \c false if method fails.
 	*/
-	bool readFile(LyXLex &, std::string const & filename);
+	bool readFile(LyXLex &, support::FileName const & filename);
 
 	bool do_writeFile(std::ostream & ofs) const;
 
@@ -384,7 +383,7 @@ private:
 	StableDocIterator anchor_;
 	/// A cache for the bibfiles (including bibfiles of loaded child
 	/// documents), needed for appropriate update of natbib labels.
-	std::vector<std::string> bibfilesCache_;
+	std::vector<support::FileName> bibfilesCache_;
 
 	/// Container for all sort of Buffer dependant errors.
 	std::map<std::string, ErrorList> errorLists_;