From f558c98c7679991152f729e1d9391e33a2ba2426 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Tue, 29 Jul 2003 10:56:55 +0000 Subject: [PATCH] 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 --- src/support/ChangeLog | 5 +++++ src/support/filename.C | 4 ++-- src/support/filename.h | 6 ++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/support/ChangeLog b/src/support/ChangeLog index a593ccdd36..0c04be43ff 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,8 @@ +2003-07-29 Angus Leeming + + * filename.[Ch] (relFilename, outputFilename): the 'path' arg + defaults to string() because MakeRelPath can accept that. + 2003-07-29 Lars Gullik Bjønnes * Makefile.am: contidionalize USE_COMPRESSION diff --git a/src/support/filename.C b/src/support/filename.C index cd4d475282..fa23523d18 100644 --- 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 8f406755a2..f09d81ac33 100644 --- 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_; -- 2.39.2