TR1: check in cmake for GCC version, fallback in checktr1.h for other build systems...

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

diff --git a/src/support/FileName.h b/src/support/FileName.h
index 2fbf2fc305e37578f94bfab6e1c67be8311c872f..23e6fd0d408a9e6625b7ac7589676ba119951657 100644 (file)
--- a/src/support/FileName.h
+++ b/src/support/FileName.h
@@ -12,6 +12,7 @@
 #ifndef FILENAME_H
 #define FILENAME_H
 
+#include "support/os.h"
 #include "support/strfwd.h"
 
 #include <ctime>
@@ -63,7 +64,7 @@ public:
        static bool isAbsolute(std::string const & name);
 
        /// get the absolute file name in UTF-8 encoding
-       std::string absFilename() const;
+       std::string absFileName() const;
 
        /** returns an absolute pathname (whose resolution does not involve
          * '.', '..', or symbolic links) in UTF-8 encoding
@@ -87,8 +88,9 @@ public:
         * producing derivative files. For example, don't use this for passing
         * file names to LaTeX, as the stem of the .dvi file will not correspond
         * to the stem of the .tex file anymore.
+        * Use os::CREATE if the file is to be accessed for writing.
         */
-       std::string toSafeFilesystemEncoding() const;
+       std::string toSafeFilesystemEncoding(os::file_access how = os::EXISTING) const;
 
        /// returns true if the file exists
        bool exists() const;
@@ -261,9 +263,9 @@ public:
        ///
        bool saveAbsPath() const { return save_abs_path_; }
        /// \param buffer_path if empty, uses `pwd`
-       std::string relFilename(std::string const & buffer_path = empty_string()) const;
+       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
@@ -286,12 +288,12 @@ 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