X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fformat.h;h=9c5c32180f9849b4ad5beb8b6e2422cbab15d77f;hb=095625dc3cd0542d13d8cc62362aa71c896eb3e0;hp=c12ff0ed6741233d351d647a47c5ec76a81c9eab;hpb=2c72e0ecaaf865dbd297652b27bf151011e987c6;p=lyx.git

diff --git a/src/format.h b/src/format.h
index c12ff0ed67..9c5c32180f 100644
--- a/src/format.h
+++ b/src/format.h
@@ -15,7 +15,11 @@
 #include "support/docstring.h"
 
 #include <vector>
-#include <string>
+
+
+namespace lyx {
+
+namespace support { class FileName; }
 
 class Buffer;
 
@@ -128,7 +132,7 @@ public:
 	 * \returns file format if it could be found, otherwise an empty
 	 * string.
 	 */
-	std::string getFormatFromFile(std::string const & filename) const;
+	std::string getFormatFromFile(support::FileName const & filename) const;
 	/// Set editor and/or viewer to "auto" for formats that can be
 	/// opened by the OS.
 	void setAutoOpen();
@@ -148,27 +152,21 @@ public:
 	///
 	void setViewer(std::string const & name, std::string const & command);
 	///
-	bool view(Buffer const & buffer, std::string const & filename,
+	bool view(Buffer const & buffer, support::FileName const & filename,
 		  std::string const & format_name) const;
 	///
-	bool edit(Buffer const & buffer, std::string const & filename,
+	bool edit(Buffer const & buffer, support::FileName const & filename,
 		  std::string const & format_name) const;
 	///
-	lyx::docstring const prettyName(std::string const & name) const;
+	docstring const prettyName(std::string const & name) const;
 	///
 	std::string const extension(std::string const & name) const;
 	///
-	const_iterator begin() const {
-		return formatlist.begin();
-	}
+	const_iterator begin() const { return formatlist.begin(); }
 	///
-	const_iterator end() const {
-		return formatlist.end();
-	}
+	const_iterator end() const { return formatlist.end(); }
 	///
-	FormatList::size_type size() const {
-		return formatlist.size();
-	}
+	FormatList::size_type size() const { return formatlist.size(); }
 private:
 	///
 	FormatList formatlist;
@@ -178,4 +176,7 @@ extern Formats formats;
 
 extern Formats system_formats;
 
+
+} // namespace lyx
+
 #endif //FORMAT_H