From 9d43d322409c80b79725ad9e20730076d83f8325 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Wed, 21 Apr 2010 01:19:25 +0000 Subject: [PATCH] DocFileName.outputFilename -> DocFileName.outputFileName git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34238 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiExternal.cpp | 2 +- src/frontends/qt4/GuiGraphics.cpp | 2 +- src/insets/ExternalSupport.cpp | 4 ++-- src/insets/InsetExternal.cpp | 4 ++-- src/insets/InsetGraphics.cpp | 4 ++-- src/insets/InsetGraphicsParams.cpp | 2 +- src/support/FileName.cpp | 2 +- src/support/FileName.h | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp index 38443e8db5..8f3402f209 100644 --- a/src/frontends/qt4/GuiExternal.cpp +++ b/src/frontends/qt4/GuiExternal.cpp @@ -460,7 +460,7 @@ static void getCrop(external::ClipData & data, void GuiExternal::updateContents() { string const name = - params_.filename.outputFilename(fromqstr(bufferFilepath())); + params_.filename.outputFileName(fromqstr(bufferFilepath())); fileED->setText(toqstr(name)); int index = 0; diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp index 8552b621d7..d9fa54a534 100644 --- a/src/frontends/qt4/GuiGraphics.cpp +++ b/src/frontends/qt4/GuiGraphics.cpp @@ -497,7 +497,7 @@ void GuiGraphics::paramsToDialog(InsetGraphicsParams const & igp) //lyxerr << bufferFilepath(); string const name = - igp.filename.outputFilename(fromqstr(bufferFilepath())); + igp.filename.outputFileName(fromqstr(bufferFilepath())); filename->setText(toqstr(name)); // set the bounding box values diff --git a/src/insets/ExternalSupport.cpp b/src/insets/ExternalSupport.cpp index 7796c796bc..bb708abd6d 100644 --- a/src/insets/ExternalSupport.cpp +++ b/src/insets/ExternalSupport.cpp @@ -89,7 +89,7 @@ string const doSubstitution(InsetExternalParams const & params, buffer.filePath(); string const filename = external_in_tmpdir ? params.filename.mangledFileName() : - params.filename.outputFilename(parentpath); + params.filename.outputFileName(parentpath); string const basename = changeExtension( onlyFilename(filename), string()); string const absname = makeAbsPath(filename, parentpath).absFileName(); @@ -361,7 +361,7 @@ int writeExternal(InsetExternalParams const & params, use_latex_path, external_in_tmpdir); 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)) { lyx::frontend::Alert::warning(_("Invalid filename"), diff --git a/src/insets/InsetExternal.cpp b/src/insets/InsetExternal.cpp index e69463f20b..3ab50c2b63 100644 --- a/src/insets/InsetExternal.cpp +++ b/src/insets/InsetExternal.cpp @@ -161,7 +161,7 @@ void InsetExternalParams::write(Buffer const & buf, ostream & os) const << "\ttemplate " << templatename() << '\n'; if (!filename.empty()) - os << "\tfilename " << filename.outputFilename(buf.filePath()) << '\n'; + os << "\tfilename " << filename.outputFileName(buf.filePath()) << '\n'; if (!display) os << "\tdisplay false\n"; @@ -623,7 +623,7 @@ int InsetExternal::latex(odocstream & os, OutputParams const & runparams) const if (params_.draft) { // FIXME UNICODE os << "\\fbox{\\ttfamily{}" - << from_utf8(params_.filename.outputFilename(buffer().filePath())) + << from_utf8(params_.filename.outputFileName(buffer().filePath())) << "}\n"; return 1; } diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp index bd657b2457..d7c1c74a68 100644 --- a/src/insets/InsetGraphics.cpp +++ b/src/insets/InsetGraphics.cpp @@ -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 // temporary file, the code is already complicated enough. 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. // 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 // run through the LaTeX compiler. string output_file = runparams.nice ? - params().filename.outputFilename(masterBuffer->filePath()) : + params().filename.outputFileName(masterBuffer->filePath()) : onlyFilename(temp_file.absFileName()); if (runparams.nice && !isValidLaTeXFilename(output_file)) { diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp index 6d30ccc42e..6aa0932421 100644 --- a/src/insets/InsetGraphicsParams.cpp +++ b/src/insets/InsetGraphicsParams.cpp @@ -141,7 +141,7 @@ void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const { // Do not write the default values if (!filename.empty()) - os << "\tfilename " << filename.outputFilename(buffer.filePath()) << '\n'; + os << "\tfilename " << filename.outputFileName(buffer.filePath()) << '\n'; if (lyxscale != 100) os << "\tlyxscale " << lyxscale << '\n'; if (!display) diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp index f37b6dffd0..0d6a2bdb6d 100644 --- a/src/support/FileName.cpp +++ b/src/support/FileName.cpp @@ -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); } diff --git a/src/support/FileName.h b/src/support/FileName.h index 269834b536..e1b732d957 100644 --- a/src/support/FileName.h +++ b/src/support/FileName.h @@ -265,7 +265,7 @@ public: /// \param buffer_path if empty, uses `pwd` 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; + std::string outputFileName(std::string const & buf_path = empty_string()) const; /** @returns a mangled representation of the absolute file name * suitable for use in the temp dir when, for example, converting -- 2.39.2