the convert patch

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

diff --git a/src/support/filename.h b/src/support/filename.h
index 8e6585761dbece51348377b9de2d8d88fb7ad1c4..06b164c2e4da187b9bb81c42a8233c8680a65394 100644 (file)
--- a/src/support/filename.h
+++ b/src/support/filename.h
@@ -12,7 +12,7 @@
 #ifndef FILENAME_H
 #define FILENAME_H
 
-#include "support/std_string.h"
+#include <string>
 
 
 namespace lyx {
@@ -22,40 +22,44 @@ namespace support {
 class FileName {
 public:
        FileName();
-       /** \param filename the file in question. Must have an absolute path.
+       /** \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?
         */
-       FileName(string const & abs_filename, bool save_abs_path = true);
+       FileName(std::string const & abs_filename, bool save_abs_path = true);
 
        /** \param filename the file in question. May have either a relative
         *  or an absolute path.
         *  \param buffer_path if \c filename has a relative path, generate
         *  the absolute path using this.
         */
-       void set(string const & filename, string const & buffer_path);
+       void set(std::string const & filename, std::string const & buffer_path);
 
        void erase();
        bool empty() const { return name_.empty(); }
 
        bool saveAbsPath() const { return save_abs_path_; }
-       string const absFilename() const { return name_; }
+       std::string const absFilename() const { return name_; }
        /// \param buffer_path if empty, uses `pwd`
-       string const relFilename(string const & buffer_path = string()) const;
+       std::string const relFilename(std::string const & buffer_path = std::string()) const;
        /// \param buf_path if empty, uses `pwd`
-       string const outputFilename(string const & buf_path = string()) const;
+       std::string const outputFilename(std::string const & buf_path = std::string()) const;
        /** \return a mangled version of the absolute file name,
         *  suitable for use in the temp dir when, for example, converting
         *  an image file to another format.
+        *  It is guaranteed that
+        *  - two different filenames have different mangled names
+        *  - two FileName instances with the same filename have identical
+        *    mangled names
         */
-       string const mangledFilename() const;
+       std::string const mangledFilename() const;
 
        /// \return true if the file is compressed.
        bool isZipped() const;
        /// \return the absolute file name without its .gz, .z, .Z extension
-       string const unzippedFilename() const;
+       std::string const unzippedFilename() const;
 
 private:
-       string name_;
+       std::string name_;
        bool save_abs_path_;
 };