CMake: fix merged build, seems GCC could not handle the namespaces correctly

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

diff --git a/src/support/FileName.h b/src/support/FileName.h
index 1c020c898f18d7e8760907d7bd3c870129ac2354..3d64ad091f5e40d41b74895936e4aef2c9b61595 100644 (file)
--- a/src/support/FileName.h
+++ b/src/support/FileName.h
@@ -60,10 +60,16 @@ public:
        /// Is this filename empty?
        bool empty() const;
        /// Is the filename absolute?
-       bool isAbsolute() const;
+       static bool isAbsolute(std::string const & name);
 
        /// get the absolute file name in UTF-8 encoding
        std::string absFilename() const;
+
+       /** returns an absolute pathname (whose resolution does not involve
+         * '.', '..', or symbolic links) in UTF-8 encoding
+         */
+       std::string realPath() const;
+
        /**
         * Get the file name in the encoding used by the file system.
         * Only use this for accessing the file, e.g. with an fstream.
@@ -72,6 +78,8 @@ public:
 
        /// returns true if the file exists
        bool exists() const;
+       /// refreshes the file info
+       void refresh() const;
        /// \return true if this object points to a symbolic link.
        bool isSymLink() const;
        /// \return true if the file is empty.
@@ -80,7 +88,7 @@ public:
        std::time_t lastModified() const;
        /// generates a checksum of a file
        virtual unsigned long checksum() const;
-       /// return true when file is readable but not writabel
+       /// return true when file is readable but not writable
        bool isReadOnly() const;
        /// return true when it names a directory
        bool isDirectory() const;
@@ -174,6 +182,9 @@ public:
        std::string onlyFileNameWithoutExt() const;
        /// only extension after the last dot.
        std::string extension() const;
+       /** checks if the file has the given extension
+               on Windows and Mac it compares case insensitive */
+       bool hasExtension(const std::string & ext);
        /// path without file name
        FileName onlyPath() const;
        /// used for display in the Gui
@@ -188,17 +199,25 @@ public:
        docstring const absoluteFilePath() const;
 
 private:
-       friend bool operator==(FileName const &, FileName const &);
+       friend bool equivalent(FileName const &, FileName const &);
        ///
        struct Private;
        Private * const d;
 };
 
 
+/// \return true if lhs and rhs represent the same file. E.g.,
+/// they might be hardlinks of one another.
+bool equivalent(FileName const & lhs, FileName const & rhs);
+/// \return true if the absolute path names are the same.
 bool operator==(FileName const &, FileName const &);
+///
 bool operator!=(FileName const &, FileName const &);
+/// Lexically compares the absolute path names.
 bool operator<(FileName const &, FileName const &);
+/// Lexically compares the absolute path names.
 bool operator>(FileName const &, FileName const &);
+/// Writes the absolute path name to the stream.
 std::ostream & operator<<(std::ostream &, FileName const &);
 
 
@@ -212,7 +231,7 @@ class DocFileName : public FileName {
 public:
        DocFileName();
        /** \param abs_filename the file in question. Must have an absolute path.
-        *  \param save_abs_path how is the file to be output to file?
+        *  \param save_abs_path how is the filename to be output?
         */
        DocFileName(std::string const & abs_filename, bool save_abs_path = true);
        DocFileName(FileName const & abs_filename, bool save_abs_path = true);
@@ -223,9 +242,9 @@ public:
         *  the absolute path using this.
         */
        virtual void set(std::string const & filename, std::string const & buffer_path);
-
+       ///
        void erase();
-
+       ///
        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;
@@ -261,6 +280,8 @@ public:
        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_;
@@ -269,7 +290,10 @@ private:
 };
 
 
+/// \return true if these have the same absolute path name AND 
+/// if save_abs_path_ has the same value in both cases.
 bool operator==(DocFileName const &, DocFileName const &);
+///
 bool operator!=(DocFileName const &, DocFileName const &);
 
 } // namespace support