X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FFileName.h;h=e1bc0de83d45a3b9e06e57d114a4d4eef40ec951;hb=f1ab5dfc5878bc736fd185279a0ef7a185b2d8d8;hp=f8da6b596dabfdad282e7ed6045ebb4dbba226da;hpb=26e5f1a8ec3eb2952e49c87c91395fdcdceddfe9;p=lyx.git

diff --git a/src/support/FileName.h b/src/support/FileName.h
index f8da6b596d..e1bc0de83d 100644
--- a/src/support/FileName.h
+++ b/src/support/FileName.h
@@ -169,18 +169,12 @@ public:
 	*/
 	void changeExtension(std::string const & extension);
 
-	/** Guess the file format name (as in Format::name()) from contents.
-	 Normally you don't want to use this directly, but rather
-	 Formats::getFormatFromFile().
-	 */
-	std::string guessFormatFromContents() const;
-
 	static FileName fromFilesystemEncoding(std::string const & name);
 	/// (securely) create a temporary file with the given mask.
 	/// \p mask must be in filesystem encoding, if it contains a
 	/// relative path, the template file will be created in the global
 	/// temporary directory as given by 'package().temp_dir()'.
-	static FileName tempName(std::string const & mask = empty_string());
+	static FileName tempName(std::string const & mask);
 	static FileName tempName(FileName const & temp_dir,
 		std::string const & mask);
 
@@ -200,6 +194,9 @@ public:
 	bool hasExtension(const std::string & ext);
 	/// path without file name
 	FileName onlyPath() const;
+	/// path of parent directory
+	/// returns empty path for root directory
+	FileName parentPath() const;
 	/// used for display in the Gui
 	docstring displayName(int threshold = 1000) const;