anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Filename.relFilename -> Filename.relFileName

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34235 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-04-21 01:19:20 +00:00
parent 62ca7f3ae5
commit e5fc2cbdc6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/insets/InsetGraphics.cpp
View File

@ -550,7 +550,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
string const orig_file = params().filename.absFileName();
// this is for dryrun and display purposes, do not use latexFilename
string const rel_file = params().filename.relFilename(buffer().filePath());
string const rel_file = params().filename.relFileName(buffer().filePath());
// previewing source code, no file copying or file format conversion
if (runparams.dryrun)
@ -980,7 +980,7 @@ void InsetGraphics::validate(LaTeXFeatures & features) const
if (features.runparams().nice) {
Buffer const * masterBuffer = features.buffer().masterBuffer();
string const rel_file = removeExtension(
params().filename.relFilename(masterBuffer->filePath()));
params().filename.relFileName(masterBuffer->filePath()));
if (contains(rel_file, "."))
features.require("lyxdot");
}

4
src/support/FileName.cpp
View File

@ -1072,7 +1072,7 @@ void DocFileName::erase()
}
string DocFileName::relFilename(string const & path) const
string DocFileName::relFileName(string const & path) const
{
// FIXME UNICODE
return to_utf8(relPath(path));
@ -1081,7 +1081,7 @@ string DocFileName::relFilename(string const & path) const
string DocFileName::outputFilename(string const & path) const
{
return save_abs_path_ ? absFileName() : relFilename(path);
return save_abs_path_ ? absFileName() : relFileName(path);
}

2
src/support/FileName.h
View File

@ -263,7 +263,7 @@ public:
///
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;
std::string relFileName(std::string const & buffer_path = empty_string()) const;
/// \param buf_path if empty, uses `pwd`
std::string outputFilename(std::string const & buf_path = empty_string()) const;