Jean-Marc teaches me that MakeRelPath is quite sophisticated...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7441 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index a593ccdd367925a90b385a979bd6f1e6475846af..0c04be43ffefbf52cee49ce7e294d4aa52a45473 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-29  Angus Leeming  <leeming@lyx.org>
+
+       * filename.[Ch] (relFilename, outputFilename): the 'path' arg
+       defaults to string() because MakeRelPath can accept that.
+
 2003-07-29  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * Makefile.am: contidionalize USE_COMPRESSION

diff --git a/src/support/filename.C b/src/support/filename.C
index cd4d475282c129505965aa6f6a26d268a435eb41..fa23523d181850311ae23ed70ba9720fc81db11f 100644 (file)
--- a/src/support/filename.C
+++ b/src/support/filename.C
@@ -43,9 +43,9 @@ string const FileName::relFilename(string const & path) const
 }
 
 
-string const FileName::outputFilename(string const & buffer_path) const
+string const FileName::outputFilename(string const & path) const
 {
-       return save_abs_path_ ? name_ : MakeRelPath(name_, buffer_path);
+       return save_abs_path_ ? name_ : MakeRelPath(name_, path);
 }
 
 

diff --git a/src/support/filename.h b/src/support/filename.h
index 8f406755a2b7d8282250b7ab3b62fa8531b435aa..f09d81ac3317eb2885fe83310ab140621387b926 100644 (file)
--- a/src/support/filename.h
+++ b/src/support/filename.h
@@ -35,8 +35,10 @@ public:
 
        bool saveAbsPath() const { return save_abs_path_; }
        string const absFilename() const { return name_; }
-       string const relFilename(string const & buffer_path) const;
-       string const outputFilename(string const & buffer_path) const;
+       /// \param buffer_path if empty, uses `pwd`
+       string const relFilename(string const & buffer_path = string()) const;
+       /// \param buf_path if empty, uses `pwd`
+       string const outputFilename(string const & buf_path = string()) const;
 
 private:
        string name_;