Work around qt bug that prevents the glyph LATIN CAPITAL LETTER SHARP S from being...

[lyx.git] / src / support / FileName.h

diff --git a/src/support/FileName.h b/src/support/FileName.h
index f86b7684835076814d861c4cb555f387f2c1efef..6744db1834206c0a8eb3abedb81432d6261c3ede 100644 (file)
--- a/src/support/FileName.h
+++ b/src/support/FileName.h
@@ -169,15 +169,6 @@ 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
@@ -265,7 +256,7 @@ public:
        /// \param buffer_path if empty, uses `pwd`
        std::string relFileName(std::string const & buffer_path = empty_string()) const;
        /// \param buf_path if empty, uses `pwd`
-       std::string outputFilename(std::string const & buf_path = empty_string()) const;
+       std::string outputFileName(std::string const & buf_path = empty_string()) const;
        
        /** @returns a mangled representation of the absolute file name
         *  suitable for use in the temp dir when, for example, converting
@@ -288,21 +279,15 @@ public:
         *  with @c dir.
         */
        std::string
-       mangledFilename(std::string const & dir = empty_string()) const;
+       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;
+       std::string unzippedFileName() const;
 
 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_;
 };