X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FFileName.h;h=e1bc0de83d45a3b9e06e57d114a4d4eef40ec951;hb=e0787e839ff94788c8e34275440285f513e4eafe;hp=23e6fd0d408a9e6625b7ac7589676ba119951657;hpb=c09d33120d05af8c237032147a787b214c1f3375;p=lyx.git

diff --git a/src/support/FileName.h b/src/support/FileName.h
index 23e6fd0d40..e1bc0de83d 100644
--- a/src/support/FileName.h
+++ b/src/support/FileName.h
@@ -169,21 +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;
-
-	/// check for zipped file
-	bool isZippedFile() 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);
 
@@ -203,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;
 
@@ -290,8 +284,6 @@ public:
 	std::string
 	mangledFileName(std::string const & dir = empty_string()) const;
 
-	/// \return true if the file is compressed.
-	bool isZipped() const;
 	/// \return the absolute file name without its .gz, .z, .Z extension
 	std::string unzippedFileName() const;
 
@@ -299,10 +291,6 @@ private:
 	/// Records whether we should save (or export) the filename as a relative
 	/// or absolute path.
 	bool save_abs_path_;
-	/// Cache for isZipped() because zippedFile() is expensive
-	mutable bool zipped_;
-	/// Is zipped_ valid?
-	mutable bool zipped_valid_;
 };