DocFileName.outputFilename -> DocFileName.outputFileName

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34238 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-04-21 01:19:25 +00:00
parent 41b81f09e1
commit 9d43d32240
8 changed files with 11 additions and 11 deletions

View File

@ -460,7 +460,7 @@ static void getCrop(external::ClipData & data,
void GuiExternal::updateContents() void GuiExternal::updateContents()
{ {
string const name = string const name =
params_.filename.outputFilename(fromqstr(bufferFilepath())); params_.filename.outputFileName(fromqstr(bufferFilepath()));
fileED->setText(toqstr(name)); fileED->setText(toqstr(name));
int index = 0; int index = 0;

View File

@ -497,7 +497,7 @@ void GuiGraphics::paramsToDialog(InsetGraphicsParams const & igp)
//lyxerr << bufferFilepath(); //lyxerr << bufferFilepath();
string const name = string const name =
igp.filename.outputFilename(fromqstr(bufferFilepath())); igp.filename.outputFileName(fromqstr(bufferFilepath()));
filename->setText(toqstr(name)); filename->setText(toqstr(name));
// set the bounding box values // set the bounding box values

View File

@ -89,7 +89,7 @@ string const doSubstitution(InsetExternalParams const & params,
buffer.filePath(); buffer.filePath();
string const filename = external_in_tmpdir ? string const filename = external_in_tmpdir ?
params.filename.mangledFileName() : params.filename.mangledFileName() :
params.filename.outputFilename(parentpath); params.filename.outputFileName(parentpath);
string const basename = changeExtension( string const basename = changeExtension(
onlyFilename(filename), string()); onlyFilename(filename), string());
string const absname = makeAbsPath(filename, parentpath).absFileName(); string const absname = makeAbsPath(filename, parentpath).absFileName();
@ -361,7 +361,7 @@ int writeExternal(InsetExternalParams const & params,
use_latex_path, external_in_tmpdir); use_latex_path, external_in_tmpdir);
string const absname = makeAbsPath( string const absname = makeAbsPath(
params.filename.outputFilename(buffer.filePath()), buffer.filePath()).absFileName(); params.filename.outputFileName(buffer.filePath()), buffer.filePath()).absFileName();
if (!external_in_tmpdir && !isValidLaTeXFilename(absname)) { if (!external_in_tmpdir && !isValidLaTeXFilename(absname)) {
lyx::frontend::Alert::warning(_("Invalid filename"), lyx::frontend::Alert::warning(_("Invalid filename"),

View File

@ -161,7 +161,7 @@ void InsetExternalParams::write(Buffer const & buf, ostream & os) const
<< "\ttemplate " << templatename() << '\n'; << "\ttemplate " << templatename() << '\n';
if (!filename.empty()) if (!filename.empty())
os << "\tfilename " << filename.outputFilename(buf.filePath()) << '\n'; os << "\tfilename " << filename.outputFileName(buf.filePath()) << '\n';
if (!display) if (!display)
os << "\tdisplay false\n"; os << "\tdisplay false\n";
@ -623,7 +623,7 @@ int InsetExternal::latex(odocstream & os, OutputParams const & runparams) const
if (params_.draft) { if (params_.draft) {
// FIXME UNICODE // FIXME UNICODE
os << "\\fbox{\\ttfamily{}" os << "\\fbox{\\ttfamily{}"
<< from_utf8(params_.filename.outputFilename(buffer().filePath())) << from_utf8(params_.filename.outputFileName(buffer().filePath()))
<< "}\n"; << "}\n";
return 1; return 1;
} }

View File

@ -565,7 +565,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
// We are not going to change the extension or using the name of the // We are not going to change the extension or using the name of the
// temporary file, the code is already complicated enough. // temporary file, the code is already complicated enough.
if (runparams.inComment || !params().filename.isReadableFile()) if (runparams.inComment || !params().filename.isReadableFile())
return params().filename.outputFilename(masterBuffer->filePath()); return params().filename.outputFileName(masterBuffer->filePath());
// We place all temporary files in the master buffer's temp dir. // We place all temporary files in the master buffer's temp dir.
// This is possible because we use mangled file names. // This is possible because we use mangled file names.
@ -586,7 +586,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
// "nice" means that the buffer is exported to LaTeX format but not // "nice" means that the buffer is exported to LaTeX format but not
// run through the LaTeX compiler. // run through the LaTeX compiler.
string output_file = runparams.nice ? string output_file = runparams.nice ?
params().filename.outputFilename(masterBuffer->filePath()) : params().filename.outputFileName(masterBuffer->filePath()) :
onlyFilename(temp_file.absFileName()); onlyFilename(temp_file.absFileName());
if (runparams.nice && !isValidLaTeXFilename(output_file)) { if (runparams.nice && !isValidLaTeXFilename(output_file)) {

View File

@ -141,7 +141,7 @@ void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const
{ {
// Do not write the default values // Do not write the default values
if (!filename.empty()) if (!filename.empty())
os << "\tfilename " << filename.outputFilename(buffer.filePath()) << '\n'; os << "\tfilename " << filename.outputFileName(buffer.filePath()) << '\n';
if (lyxscale != 100) if (lyxscale != 100)
os << "\tlyxscale " << lyxscale << '\n'; os << "\tlyxscale " << lyxscale << '\n';
if (!display) if (!display)

View File

@ -1079,7 +1079,7 @@ string DocFileName::relFileName(string const & path) const
} }
string DocFileName::outputFilename(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);
} }

View File

@ -265,7 +265,7 @@ public:
/// \param buffer_path if empty, uses `pwd` /// \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` /// \param buf_path if empty, uses `pwd`
std::string outputFilename(std::string const & buf_path = empty_string()) const; std::string outputFileName(std::string const & buf_path = empty_string()) const;
/** @returns a mangled representation of the absolute file name /** @returns a mangled representation of the absolute file name
* suitable for use in the temp dir when, for example, converting * suitable for use in the temp dir when, for example, converting