chmod fixes for msvc

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

diff --git a/src/support/filename.C b/src/support/filename.C
index 67dde87f724b340d9919ee89f736943a347a0fe2..609c93b258691b0d89fecdf56519f4aa428e4ec8 100644 (file)
--- a/src/support/filename.C
+++ b/src/support/filename.C
@@ -36,34 +36,36 @@ FileName::FileName()
 
 
 FileName::FileName(string const & abs_filename, bool save_abs)
-       : name_(abs_filename), save_abs_path_(save_abs)
+       : name_(abs_filename), save_abs_path_(save_abs), zipped_valid_(false)
 {
-       BOOST_ASSERT(AbsolutePath(name_));
+       BOOST_ASSERT(absolutePath(name_));
 }
 
 
 void FileName::set(string const & name, string const & buffer_path)
 {
-       save_abs_path_ = AbsolutePath(name);
-       name_ = save_abs_path_ ? name : MakeAbsPath(name, buffer_path);
+       save_abs_path_ = absolutePath(name);
+       name_ = save_abs_path_ ? name : makeAbsPath(name, buffer_path);
+       zipped_valid_ = false;
 }
 
 
 void FileName::erase()
 {
        name_.erase();
+       zipped_valid_ = false;
 }
 
 
 string const FileName::relFilename(string const & path) const
 {
-       return MakeRelPath(name_, path);
+       return makeRelPath(name_, path);
 }
 
 
 string const FileName::outputFilename(string const & path) const
 {
-       return save_abs_path_ ? name_ : MakeRelPath(name_, path);
+       return save_abs_path_ ? name_ : makeRelPath(name_, path);
 }
 
 
@@ -80,7 +82,7 @@ string const FileName::mangledFilename(std::string const & dir) const
        // Now the real work
        string mname = os::internal_path(name_);
        // Remove the extension.
-       mname = ChangeExtension(name_, string());
+       mname = changeExtension(name_, string());
        // Replace '/' in the file name with '_'
        mname = subst(mname, "/", "_");
        // Replace '.' in the file name with '_'
@@ -90,7 +92,7 @@ string const FileName::mangledFilename(std::string const & dir) const
        // Replace ':' in the file name with '_'
        mname = subst(mname, ":", "_");
        // Add the extension back on
-       mname = ChangeExtension(mname, GetExtension(name_));
+       mname = changeExtension(mname, getExtension(name_));
 
        // Prepend a counter to the filename. This is necessary to make
        // the mangled name unique.
@@ -125,7 +127,11 @@ string const FileName::mangledFilename(std::string const & dir) const
 
 bool FileName::isZipped() const
 {
-       return zippedFile(name_);
+       if (!zipped_valid_) {
+               zipped_ = zippedFile(name_);
+               zipped_valid_ = true;
+       }
+       return zipped_;
 }